Make mssql extension a module (#18804)

* Rebase from main branch

* import from module

* Add mssql module ref

Co-authored-by: Charles Gagnon <chgagnon@microsoft.com>

extensions/cms/src/cmsUtils.ts

@@ -6,7 +6,7 @@
 import * as nls from 'vscode-nls';
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';
-import * as mssql from '../../mssql';
+import * as mssql from 'mssql';
 import * as Utils from './cmsResource/utils';
 import { ICmsResourceNodeInfo } from './cmsResource/tree/baseTreeNodes';
 

extensions/cms/src/typings/ref.d.ts

@@ -6,4 +6,5 @@
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
-/// <reference types='@types/node'/>
+/// <reference path='../../../mssql/src/mssql.d.ts'/>
+/// <reference types='@types/node'/>

extensions/dacpac/src/test/testDacFxService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as azdata from 'azdata';
-import * as mssql from '../../../mssql/src/mssql';
+import * as mssql from 'mssql';
 
 export const deployOperationId = 'deploy dacpac';
 export const extractOperationId = 'extract dacpac';

extensions/dacpac/src/typings/ref.d.ts

@@ -6,4 +6,5 @@
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
+/// <reference path='../../../mssql/src/mssql.d.ts'/>
 /// <reference types='@types/node'/>

extensions/dacpac/src/wizard/dataTierApplicationWizard.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';
 import * as loc from '../localizedConstants';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as utils from '../utils';
 import { SelectOperationPage } from './pages/selectOperationpage';
 import { DeployConfigPage } from './pages/deployConfigPage';

extensions/integration-tests/src/test/cms.test.ts

@@ -6,7 +6,7 @@
 import 'mocha';
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as utils from './utils';
 import * as uuid from './uuid';
 import assert = require('assert');

extensions/integration-tests/src/test/dacpac.test.ts

@@ -9,7 +9,7 @@ import * as utils from './utils';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as os from 'os';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as vscode from 'vscode';
 import { getStandaloneServer } from './testConfig';
 import * as assert from 'assert';

extensions/integration-tests/src/test/schemaCompare.test.ts

@@ -7,7 +7,7 @@ import 'mocha';
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import * as utils from './utils';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as os from 'os';
 import * as fs from 'fs';
 import * as path from 'path';

extensions/integration-tests/src/typings/ref.d.ts

@@ -5,5 +5,6 @@
 /// <reference path='../../../../src/sql/azdata.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.test.d.ts'/>
+/// <reference path='../../../mssql/src/mssql.d.ts'/>
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference types='@types/node'/>

extensions/machine-learning/src/externalLanguage/languageService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as azdata from 'azdata';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import { ApiWrapper } from '../common/apiWrapper';
 
 /**

extensions/machine-learning/src/test/views/externalLanguages/languageController.test.ts

@@ -8,7 +8,7 @@ import 'mocha';
 import * as TypeMoq from 'typemoq';
 import { createContext } from './utils';
 import { LanguageController } from '../../../views/externalLanguages/languageController';
-import * as mssql from '../../../../../mssql';
+import * as mssql from 'mssql';
 
 describe('External Languages Controller', () => {
 	it('Should open dialog for manage languages successfully ', async function (): Promise<void> {
@@ -21,7 +21,7 @@ describe('External Languages Controller', () => {
 
 	it('Should list languages successfully ', async function (): Promise<void> {
 		let testContext = createContext();
-		let languages: mssql.ExternalLanguage[]  = [{
+		let languages: mssql.ExternalLanguage[] = [{
 			name: '',
 			contents: [{
 				extensionFileName: '',
@@ -30,7 +30,7 @@ describe('External Languages Controller', () => {
 			}]
 		}];
 
-		testContext.dialogModel.setup( x=> x.getLanguageList()).returns(() => Promise.resolve(languages));
+		testContext.dialogModel.setup(x => x.getLanguageList()).returns(() => Promise.resolve(languages));
 		let controller = new LanguageController(testContext.apiWrapper.object, '', testContext.dialogModel.object);
 		let dialog = await controller.manageLanguages();
 		let actual = await dialog.listLanguages();
@@ -48,7 +48,7 @@ describe('External Languages Controller', () => {
 			}]
 		};
 
-		testContext.dialogModel.setup( x=> x.updateLanguage(language)).returns(() => Promise.resolve());
+		testContext.dialogModel.setup(x => x.updateLanguage(language)).returns(() => Promise.resolve());
 		let controller = new LanguageController(testContext.apiWrapper.object, '', testContext.dialogModel.object);
 		let dialog = await controller.manageLanguages();
 		await dialog.updateLanguage({
@@ -70,7 +70,7 @@ describe('External Languages Controller', () => {
 			}]
 		};
 
-		testContext.dialogModel.setup( x=> x.deleteLanguage(language.name)).returns(() => Promise.resolve());
+		testContext.dialogModel.setup(x => x.deleteLanguage(language.name)).returns(() => Promise.resolve());
 		let controller = new LanguageController(testContext.apiWrapper.object, '', testContext.dialogModel.object);
 		let dialog = await controller.manageLanguages();
 		await dialog.deleteLanguage({

extensions/machine-learning/src/test/views/externalLanguages/languagesDialogModel.test.ts

@@ -6,13 +6,13 @@
 import * as should from 'should';
 import 'mocha';
 import { createContext } from './utils';
-import * as mssql from '../../../../../mssql';
+import * as mssql from 'mssql';
 import { LanguageService } from '../../../externalLanguage/languageService';
 
 describe('External Languages Dialog Model', () => {
 	it('Should list languages successfully ', async function (): Promise<void> {
 		let testContext = createContext();
-		let languages: mssql.ExternalLanguage[]  = [{
+		let languages: mssql.ExternalLanguage[] = [{
 			name: '',
 			contents: [{
 				extensionFileName: '',
@@ -20,7 +20,7 @@ describe('External Languages Dialog Model', () => {
 				pathToExtension: '',
 			}]
 		}];
-		testContext.languageExtensionService.listLanguages = () => {return Promise.resolve(languages);};
+		testContext.languageExtensionService.listLanguages = () => { return Promise.resolve(languages); };
 		let model = new LanguageService(testContext.apiWrapper.object, testContext.languageExtensionService);
 		await model.load();
 		let actual = await model.getLanguageList();
@@ -29,7 +29,7 @@ describe('External Languages Dialog Model', () => {
 
 	it('Should update language successfully ', async function (): Promise<void> {
 		let testContext = createContext();
-		let language: mssql.ExternalLanguage  = {
+		let language: mssql.ExternalLanguage = {
 			name: '',
 			contents: [{
 				extensionFileName: '',
@@ -45,7 +45,7 @@ describe('External Languages Dialog Model', () => {
 
 	it('Should delete language successfully ', async function (): Promise<void> {
 		let testContext = createContext();
-		let language: mssql.ExternalLanguage  = {
+		let language: mssql.ExternalLanguage = {
 			name: '',
 			contents: [{
 				extensionFileName: '',

extensions/machine-learning/src/test/views/externalLanguages/utils.ts

@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 import * as TypeMoq from 'typemoq';
 import { ApiWrapper } from '../../../common/apiWrapper';
 import { LanguageViewBase } from '../../../views/externalLanguages/languageViewBase';
-import * as mssql from '../../../../../mssql';
+import * as mssql from 'mssql';
 import { LanguageService } from '../../../externalLanguage/languageService';
 import { createViewContext } from '../utils';
 

extensions/machine-learning/src/typings/ref.d.ts

@@ -8,4 +8,5 @@
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
 /// <reference path='../../../azurecore/src/azurecore.d.ts'/>
 /// <reference path='../../../azurecore/src/azureResource/azure-resource.d.ts'/>
+/// <reference path='../../../mssql/src/mssql.d.ts'/>
 /// <reference types='@types/node'/>

extensions/machine-learning/src/views/externalLanguages/languageContentView.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as azdata from 'azdata';
-import * as mssql from '../../../../mssql';
+import * as mssql from 'mssql';
 import { LanguageViewBase } from './languageViewBase';
 import * as constants from '../../common/constants';
 import { ApiWrapper } from '../../common/apiWrapper';

extensions/machine-learning/src/views/externalLanguages/languageController.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as mssql from '../../../../mssql';
+import * as mssql from 'mssql';
 import { ApiWrapper } from '../../common/apiWrapper';
 import { LanguageService } from '../../externalLanguage/languageService';
 import { LanguagesDialog } from './languagesDialog';

extensions/machine-learning/src/views/externalLanguages/languageViewBase.ts

@@ -7,7 +7,7 @@ import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import * as constants from '../../common/constants';
 import { ApiWrapper } from '../../common/apiWrapper';
-import * as mssql from '../../../../mssql';
+import * as mssql from 'mssql';
 import * as path from 'path';
 
 export interface LanguageUpdateModel {

extensions/machine-learning/src/views/externalLanguages/languagesTable.ts

@@ -5,7 +5,7 @@
 
 import * as azdata from 'azdata';
 import * as constants from '../../common/constants';
-import * as mssql from '../../../../mssql';
+import * as mssql from 'mssql';
 import { LanguageViewBase } from './languageViewBase';
 import { ApiWrapper } from '../../common/apiWrapper';
 

extensions/mssql/src/cms/cmsService.ts

@@ -9,7 +9,7 @@ import * as contracts from '../contracts';
 import { AppContext } from '../appContext';
 import { ConnectParams, ClientCapabilities } from 'dataprotocol-client/lib/protocol';
 import { SqlOpsDataClient, ISqlOpsFeature } from 'dataprotocol-client';
-import { ListRegisteredServersResult, ICmsService } from '../mssql';
+import { ListRegisteredServersResult, ICmsService } from 'mssql';
 import * as Utils from '../utils';
 
 export class CmsService implements ICmsService {

extensions/mssql/src/contracts.ts

@@ -7,7 +7,7 @@ import { NotificationType, RequestType } from 'vscode-languageclient';
 import { ITelemetryEventProperties, ITelemetryEventMeasures } from './telemetry';
 import * as azdata from 'azdata';
 import { ConnectParams } from 'dataprotocol-client/lib/protocol';
-import * as mssql from './mssql';
+import * as mssql from 'mssql';
 
 // ------------------------------- < Telemetry Sent Event > ------------------------------------
 

extensions/mssql/src/dacfx/dacFxService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as mssql from '../mssql';
+import * as mssql from 'mssql';
 import { AppContext } from '../appContext';
 import { ISqlOpsFeature, SqlOpsDataClient } from 'dataprotocol-client';
 import { ClientCapabilities } from 'vscode-languageclient';

extensions/mssql/src/languageExtension/languageExtensionService.ts

@@ -6,7 +6,7 @@
 import { AppContext } from '../appContext';
 import { SqlOpsDataClient, ISqlOpsFeature } from 'dataprotocol-client';
 import * as constants from '../constants';
-import * as mssql from '../mssql';
+import * as mssql from 'mssql';
 import * as Utils from '../utils';
 import { ClientCapabilities } from 'vscode-languageclient';
 import * as contracts from '../contracts';

extensions/mssql/src/main.ts

@@ -15,7 +15,7 @@ import { AppContext } from './appContext';
 import { UploadFilesCommand, MkDirCommand, SaveFileCommand, PreviewFileCommand, CopyPathCommand, DeleteFilesCommand, ManageAccessCommand } from './objectExplorerNodeProvider/hdfsCommands';
 import { IPrompter } from './prompts/question';
 import CodeAdapter from './prompts/adapter';
-import { IExtension } from './mssql';
+import { IExtension } from 'mssql';
 import { OpenSparkJobSubmissionDialogCommand, OpenSparkJobSubmissionDialogFromFileCommand, OpenSparkJobSubmissionDialogTask } from './sparkFeature/dialog/dialogCommands';
 import { OpenSparkYarnHistoryTask } from './sparkFeature/historyTask';
 import { MssqlObjectExplorerNodeProvider, mssqlOutputChannel } from './objectExplorerNodeProvider/objectExplorerNodeProvider';

extensions/mssql/src/mssqlApiFactory.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { AppContext } from './appContext';
-import { IExtension, ICmsService, IDacFxService, ISchemaCompareService, MssqlObjectExplorerBrowser, ILanguageExtensionService, ISqlAssessmentService, ISqlMigrationService } from './mssql';
+import { IExtension, ICmsService, IDacFxService, ISchemaCompareService, MssqlObjectExplorerBrowser, ILanguageExtensionService, ISqlAssessmentService, ISqlMigrationService } from 'mssql';
 import * as constants from './constants';
 import { MssqlObjectExplorerNodeProvider } from './objectExplorerNodeProvider/objectExplorerNodeProvider';
 import * as azdata from 'azdata';

extensions/mssql/src/schemaCompare/schemaCompareService.ts

@@ -6,7 +6,7 @@
 import { AppContext } from '../appContext';
 import { SqlOpsDataClient, ISqlOpsFeature } from 'dataprotocol-client';
 import * as constants from '../constants';
-import * as mssql from '../mssql';
+import * as mssql from 'mssql';
 import * as Utils from '../utils';
 import { ClientCapabilities } from 'vscode-languageclient';
 import * as azdata from 'azdata';

extensions/mssql/src/sqlAssessment/sqlAssessmentService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as mssql from '../mssql';
+import * as mssql from 'mssql';
 import { AppContext } from '../appContext';
 import { SqlOpsDataClient, ISqlOpsFeature } from 'dataprotocol-client';
 import { ClientCapabilities } from 'vscode-languageclient';

extensions/mssql/src/sqlMigration/sqlMigrationService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as mssql from '../mssql';
+import * as mssql from 'mssql';
 import { AppContext } from '../appContext';
 import { SqlOpsDataClient, ISqlOpsFeature } from 'dataprotocol-client';
 import { ClientCapabilities } from 'vscode-languageclient';

extensions/schema-compare/src/dialogs/schemaCompareDialog.ts

@@ -7,7 +7,7 @@ import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import * as path from 'path';
 import * as sqldbproj from 'sqldbproj';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as loc from '../localizedConstants';
 import { SchemaCompareMainWindow } from '../schemaCompareMainWindow';
 import { TelemetryReporter, TelemetryViews } from '../telemetry';

extensions/schema-compare/src/dialogs/schemaCompareOptionsDialog.ts

@@ -5,7 +5,7 @@
 
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as loc from '../localizedConstants';
 import { SchemaCompareMainWindow } from '../schemaCompareMainWindow';
 import { isNullOrUndefined } from 'util';

extensions/schema-compare/src/extension.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import * as mssql from '../../mssql/src/mssql';
+import * as mssql from 'mssql';
 import { SchemaCompareMainWindow } from './schemaCompareMainWindow';
 
 export async function activate(extensionContext: vscode.ExtensionContext): Promise<void> {

extensions/schema-compare/src/models/schemaCompareOptionsModel.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as loc from '../localizedConstants';
-import * as mssql from '../../../mssql/src/mssql';
+import * as mssql from 'mssql';
 import { isNullOrUndefined } from 'util';
 
 export class SchemaCompareOptionsModel {

extensions/schema-compare/src/schemaCompareMainWindow.ts

@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 import * as os from 'os';
 import * as path from 'path';
 import * as sqldbproj from 'sqldbproj';
-import * as mssql from '../../mssql';
+import * as mssql from 'mssql';
 import * as loc from './localizedConstants';
 import { SchemaCompareOptionsDialog } from './dialogs/schemaCompareOptionsDialog';
 import { TelemetryReporter, TelemetryViews } from './telemetry';

extensions/schema-compare/src/test/models/schemaCompareOptionsModel.test.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as should from 'should';
-import * as mssql from '../../../../mssql/src/mssql';
+import * as mssql from 'mssql';
-import {SchemaCompareOptionsModel} from '../../models/schemaCompareOptionsModel';
+import { SchemaCompareOptionsModel } from '../../models/schemaCompareOptionsModel';
 
 describe('Schema Compare Options Model', () => {
 	it('Should create model and set options successfully', function (): void {
@@ -39,7 +39,7 @@ describe('Schema Compare Options Model', () => {
 	});
 });
 
-const defaultOptions: mssql.DeploymentOptions =  {
+const defaultOptions: mssql.DeploymentOptions = {
 	ignoreTableOptions: false,
 	ignoreSemicolonBetweenStatements: false,
 	ignoreRouteLifetime: false,

extensions/schema-compare/src/test/schemaCompare.test.ts

@@ -5,7 +5,7 @@
 
 import * as should from 'should';
 import * as vscode from 'vscode';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as TypeMoq from 'typemoq';
 import * as loc from '../localizedConstants';
 import 'mocha';
@@ -67,7 +67,7 @@ describe('SchemaCompareMainWindow.start @DacFx@', function (): void {
 		let sc = new SchemaCompareTestService();
 
 		let result = new SchemaCompareMainWindowTest(sc, mockExtensionContext.object, null);
-		await result.start({connectionProfile: mockIConnectionProfile});
+		await result.start({ connectionProfile: mockIConnectionProfile });
 
 		should.notEqual(result.sourceEndpointInfo, undefined);
 		should.equal(result.sourceEndpointInfo.endpointType, mssql.SchemaCompareEndpointType.Database);
@@ -502,7 +502,8 @@ describe('SchemaCompareMainWindow.execute @DacFx@', function (): void {
 			selectSourceButtonState: true,
 			selectTargetButtonState: true,
 			generateScriptButtonState: true,
-			applyButtonState: true} );
+			applyButtonState: true
+		});
 	});
 
 });

extensions/schema-compare/src/test/testSchemaCompareMainWindow.ts

@@ -5,7 +5,7 @@
 
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as should from 'should';
 import { SchemaCompareMainWindow } from '../schemaCompareMainWindow';
 

extensions/schema-compare/src/test/testSchemaCompareService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as azdata from 'azdata';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 
 export class SchemaCompareTestService implements mssql.ISchemaCompareService {
 

extensions/schema-compare/src/test/testUtils.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as azdata from 'azdata';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import should = require('should');
 import { AssertionError } from 'assert';
 

extensions/schema-compare/src/test/utils.test.ts

@@ -6,7 +6,7 @@
 import * as should from 'should';
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as loc from '../localizedConstants';
 import * as TypeMoq from 'typemoq';
 import * as path from 'path';

extensions/schema-compare/src/typings/ref.d.ts

@@ -8,4 +8,5 @@
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
 /// <reference path='../../../data-workspace/src/dataworkspace.d.ts'/>
 /// <reference path='../../../sql-database-projects/src/sqldbproj.d.ts'/>
+/// <reference path='../../../mssql/src/mssql.d.ts'/>
 /// <reference types='@types/node'/>

extensions/schema-compare/src/utils.ts

@@ -6,7 +6,7 @@
 import * as azdata from 'azdata';
 import type * as azdataType from 'azdata'; // eslint-disable-line no-duplicate-imports
 import * as vscode from 'vscode';
-import * as mssql from '../../mssql';
+import * as mssql from 'mssql';
 import * as os from 'os';
 import * as loc from './localizedConstants';
 import * as dataworkspace from 'dataworkspace';

extensions/sql-assessment/src/engine.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as mssql from '../../mssql';
+import * as mssql from 'mssql';
 import * as azdata from 'azdata';
 import { createHistoryFileName, readHistoryFileNames, getAssessmentDate, TargetWithChildren } from './utils';
 import { promises as fs } from 'fs';

extensions/sql-assessment/src/maincontroller.ts

@@ -5,7 +5,7 @@
 
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
-import * as mssql from '../../mssql';
+import * as mssql from 'mssql';
 import { SqlAssessmentMainTab } from './tabs/assessmentMainTab';
 import { SqlAssessmentHistoryTab } from './tabs/historyTab';
 import { AssessmentEngine } from './engine';

extensions/sql-assessment/src/typings/ref.d.ts

@@ -6,4 +6,5 @@
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
-/// <reference types='@types/node'/>
+/// <reference path='../../../mssql/src/mssql.d.ts'/>
+/// <reference types='@types/node'/>

extensions/sql-bindings/src/test/testUtils.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import * as TypeMoq from 'typemoq';
-import * as mssql from '../../../mssql/src/mssql';
+import * as mssql from 'mssql';
 import * as vscodeMssql from 'vscode-mssql';
 import { RequestType } from 'vscode-languageclient';
 

extensions/sql-bindings/src/typings/ref.d.ts

@@ -6,5 +6,6 @@
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
+/// <reference path='../../../mssql/src/mssql.d.ts'/>
 /// <reference path='../../../types/vscode-mssql.d.ts'/>
 /// <reference types='@types/node'/>

extensions/sql-database-projects/src/common/utils.ts

@@ -10,7 +10,7 @@ import * as constants from './constants';
 import * as path from 'path';
 import * as glob from 'fast-glob';
 import * as dataworkspace from 'dataworkspace';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as vscodeMssql from 'vscode-mssql';
 import * as fse from 'fs-extra';
 import * as which from 'which';

extensions/sql-database-projects/src/controllers/mainController.ts

@@ -6,7 +6,7 @@
 import type * as azdataType from 'azdata';
 import * as vscode from 'vscode';
 import * as vscodeMssql from 'vscode-mssql';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as templates from '../templates/templates';
 import * as path from 'path';
 

extensions/sql-database-projects/src/controllers/projectController.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as constants from '../common/constants';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as os from 'os';
 import * as path from 'path';
 import * as utils from '../common/utils';

extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseDialog.ts

@@ -7,7 +7,7 @@ import type * as azdataType from 'azdata';
 import * as vscode from 'vscode';
 import * as constants from '../common/constants';
 import * as newProjectTool from '../tools/newProjectTool';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as path from 'path';
 
 import { IconPathHelper } from '../common/iconHelper';

extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts

@@ -11,7 +11,7 @@ import * as utils from '../common/utils';
 import { Project } from '../models/project';
 import { SqlConnectionDataSource } from '../models/dataSources/sqlConnectionStringSource';
 import { IDeploySettings } from '../models/IDeploySettings';
-import { DeploymentOptions } from '../../../mssql/src/mssql';
+import { DeploymentOptions } from 'mssql';
 import { IconPathHelper } from '../common/iconHelper';
 import { cssStyles } from '../common/uiConstants';
 import { getAgreementDisplayText, getConnectionName, getDockerBaseImages } from './utils';

extensions/sql-database-projects/src/dialogs/updateProjectFromDatabaseDialog.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import type * as azdata from 'azdata';
 import * as constants from '../common/constants';
 import * as newProjectTool from '../tools/newProjectTool';

extensions/sql-database-projects/src/models/IDeploySettings.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DeploymentOptions as mssqlDeploymentOptions } from '../../../mssql/src/mssql';
+import { DeploymentOptions as mssqlDeploymentOptions } from 'mssql';
 import { DeploymentOptions as vscodeMssqlDeploymentOptions } from 'vscode-mssql';
 
 export type DeploymentOptions = mssqlDeploymentOptions | vscodeMssqlDeploymentOptions;

extensions/sql-database-projects/src/models/api/import.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as mssql from '../../../../mssql';
+import * as mssql from 'mssql';
 import * as vscodeMssql from 'vscode-mssql';
 
 type ExtractTarget = mssql.ExtractTarget | vscodeMssql.ExtractTarget;

extensions/sql-database-projects/src/models/api/updateProject.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as mssql from '../../../../mssql/src/mssql';
+import * as mssql from 'mssql';
 
 export interface UpdateProjectDataModel {
 	sourceEndpointInfo: mssql.SchemaCompareEndpointInfo;

extensions/sql-database-projects/src/models/publishProfile/publishProfile.ts

@@ -6,7 +6,7 @@
 import * as xmldom from 'xmldom';
 import * as constants from '../../common/constants';
 import * as utils from '../../common/utils';
-import * as mssql from '../../../../mssql';
+import * as mssql from 'mssql';
 import * as vscodeMssql from 'vscode-mssql';
 import * as vscode from 'vscode';
 

extensions/sql-database-projects/src/test/dialogs/createProjectFromDatabaseDialog.test.ts

@@ -5,7 +5,7 @@
 
 import * as should from 'should';
 import * as azdata from 'azdata';
-import * as mssql from '../../../../mssql';
+import * as mssql from 'mssql';
 import * as sinon from 'sinon';
 import { CreateProjectFromDatabaseDialog } from '../../dialogs/createProjectFromDatabaseDialog';
 import { mockConnectionProfile } from '../testContext';
@@ -94,7 +94,7 @@ describe('Create Project From Database Dialog', () => {
 
 		let model: ImportDataModel;
 
-		const expectedImportDataModel: ImportDataModel  = {
+		const expectedImportDataModel: ImportDataModel = {
 			connectionUri: stubUri,
 			database: 'My Database',
 			projName: 'testProject',

extensions/sql-database-projects/src/test/projectController.test.ts

@@ -14,7 +14,7 @@ import * as baselines from './baselines/baselines';
 import * as templates from '../templates/templates';
 import * as testUtils from './testUtils';
 import * as constants from '../common/constants';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import * as utils from '../common/utils';
 
 import { SqlDatabaseProjectTreeViewProvider } from '../controllers/databaseProjectTreeViewProvider';

extensions/sql-database-projects/src/test/testContext.ts

@@ -7,7 +7,8 @@ import * as vscode from 'vscode';
 import * as azdata from 'azdata';
 import * as path from 'path';
 import * as TypeMoq from 'typemoq';
-import * as mssql from '../../../mssql/src/mssql';
+import * as mssql from 'mssql';
+
 
 export interface TestContext {
 	context: vscode.ExtensionContext;

extensions/sql-database-projects/src/tools/buildHelper.ts

@@ -8,7 +8,7 @@ import * as path from 'path';
 import { promises as fs } from 'fs';
 import * as utils from '../common/utils';
 import { errorFindingBuildFilesLocation } from '../common/constants';
-import * as mssql from '../../../mssql/src/mssql';
+import * as mssql from 'mssql';
 import * as vscodeMssql from 'vscode-mssql';
 import * as sqldbproj from 'sqldbproj';
 

extensions/sql-database-projects/src/typings/ref.d.ts

@@ -7,5 +7,6 @@
 /// <reference path='../../../../src/sql/azdata.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
 /// <reference path='../../../data-workspace/src/dataworkspace.d.ts'/>
+/// <reference path='../../../mssql/src/mssql.d.ts'/>
 /// <reference path='../../../types/vscode-mssql.d.ts'/>
 /// <reference types='@types/node'/>

extensions/sql-migration/src/dialog/assessmentResults/assessmentResultsDialog.ts

@@ -7,7 +7,7 @@ import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import { MigrationStateModel, MigrationTargetType } from '../../models/stateMachine';
 import { SqlDatabaseTree } from './sqlDatabasesTree';
-import { SqlMigrationImpactedObjectInfo } from '../../../../mssql/src/mssql';
+import { SqlMigrationImpactedObjectInfo } from 'mssql';
 import { SKURecommendationPage } from '../../wizard/skuRecommendationPage';
 
 export type Issues = {

extensions/sql-migration/src/dialog/assessmentResults/sqlDatabasesTree.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
-import { SqlMigrationAssessmentResultItem, SqlMigrationImpactedObjectInfo } from '../../../../mssql/src/mssql';
+import { SqlMigrationAssessmentResultItem, SqlMigrationImpactedObjectInfo } from 'mssql';
 import { MigrationStateModel, MigrationTargetType } from '../../models/stateMachine';
 import * as constants from '../../constants/strings';
 import { debounce } from '../../api/utils';

extensions/sql-migration/src/dialog/retryMigration/retryMigrationDialog.ts

@@ -5,7 +5,7 @@
 
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
-import * as mssql from '../../../../mssql';
+import * as mssql from 'mssql';
 import { azureResource } from 'azureResource';
 import { getLocations, getResourceGroupFromId, getBlobContainerId, getFullResourceGroupFromId, getResourceName } from '../../api/azure';
 import { MigrationMode, MigrationStateModel, NetworkContainerType, SavedInfo } from '../../models/stateMachine';

extensions/sql-migration/src/dialog/skuRecommendationResults/skuRecommendationResultsDialog.ts

@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 import { MigrationStateModel, MigrationTargetType } from '../../models/stateMachine';
 import * as constants from '../../constants/strings';
 import * as styles from '../../constants/styles';
-import * as mssql from '../../../../mssql';
+import * as mssql from 'mssql';
 
 export class SkuRecommendationResultsDialog {
 

extensions/sql-migration/src/main.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';
 import { WizardController } from './wizard/wizardController';
-import * as mssql from '../../mssql';
+import * as mssql from 'mssql';
 import { promises as fs } from 'fs';
 import * as loc from './constants/strings';
 import { MigrationNotebookInfo, NotebookPathHelper } from './constants/notebookPathHelper';

extensions/sql-migration/src/models/stateMachine.ts

@@ -7,7 +7,7 @@ import * as azdata from 'azdata';
 import { azureResource } from 'azureResource';
 import * as azurecore from 'azurecore';
 import * as vscode from 'vscode';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import { getAvailableManagedInstanceProducts, getAvailableStorageAccounts, getBlobContainers, getFileShares, getSqlMigrationServices, getSubscriptions, SqlMigrationService, SqlManagedInstance, startDatabaseMigration, StartDatabaseMigrationRequest, StorageAccount, getAvailableSqlVMs, SqlVMServer, getLocations, getResourceGroups, getLocationDisplayName, getSqlManagedInstanceDatabases, getBlobs } from '../api/azure';
 import * as constants from '../constants/strings';
 import { MigrationLocalStorage } from './migrationLocalStorage';

extensions/sql-migration/src/typings/ref.d.ts

@@ -8,4 +8,5 @@
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
 /// <reference path='../../../azurecore/src/azurecore.d.ts'/>
 /// <reference path='../../../azurecore/src/azureResource/azure-resource.d.ts'/>
+/// <reference path='../../../mssql/src/mssql.d.ts'/>
 /// <reference types='@types/node'/>

extensions/sql-migration/src/wizard/skuRecommendationPage.ts

@@ -5,7 +5,7 @@
 
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import { MigrationWizardPage } from '../models/migrationWizardPage';
 import { MigrationStateModel, MigrationTargetType, PerformanceDataSourceOptions, StateChangeEvent } from '../models/stateMachine';
 import { AssessmentResultsDialog } from '../dialog/assessmentResults/assessmentResultsDialog';

extensions/sql-migration/src/wizard/wizardController.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
-import * as mssql from '../../../mssql';
+import * as mssql from 'mssql';
 import { MigrationStateModel, NetworkContainerType, Page } from '../models/stateMachine';
 import * as loc from '../constants/strings';
 import { MigrationWizardPage } from '../models/migrationWizardPage';

src/sql/workbench/api/common/sqlExtHost.protocol.ts

@@ -719,7 +719,7 @@ export const SqlMainContext = {
 	MainThreadNotebook: createMainId<MainThreadNotebookShape>('MainThreadNotebook'),
 	MainThreadNotebookDocumentsAndEditors: createMainId<MainThreadNotebookDocumentsAndEditorsShape>('MainThreadNotebookDocumentsAndEditors'),
 	MainThreadExtensionManagement: createMainId<MainThreadExtensionManagementShape>('MainThreadExtensionManagement'),
-	MainThreadWorkspace: createMainId<MainThreadWorkspaceShape>('MainThreadWorkspace')
+	MainThreadWorkspace: createMainId<MainThreadWorkspaceShape>('MainThreadWorkspace'),
 };
 
 export const SqlExtHostContext = {
@@ -742,7 +742,7 @@ export const SqlExtHostContext = {
 	ExtHostNotebook: createExtId<ExtHostNotebookShape>('ExtHostNotebook'),
 	ExtHostNotebookDocumentsAndEditors: createExtId<ExtHostNotebookDocumentsAndEditorsShape>('ExtHostNotebookDocumentsAndEditors'),
 	ExtHostExtensionManagement: createExtId<ExtHostExtensionManagementShape>('ExtHostExtensionManagement'),
-	ExtHostWorkspace: createExtId<ExtHostWorkspaceShape>('ExtHostWorkspace')
+	ExtHostWorkspace: createExtId<ExtHostWorkspaceShape>('ExtHostWorkspace'),
 };
 
 export interface MainThreadDashboardShape extends IDisposable {