Merge VS Code 1.31.1 (#4283)

src/sqltest/stubs/credentialsTestStubs.ts

@@ -6,7 +6,6 @@
 'use strict';
 
 import * as azdata from 'azdata';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { CredentialManagementEvents, ICredentialsService } from 'sql/platform/credentials/common/credentialsService';
 import { IDisposable } from 'vs/base/common/lifecycle';
 
@@ -20,17 +19,17 @@ export class CredentialsTestProvider implements azdata.CredentialProvider {
 			credentialId: credentialId,
 			password: password
 		};
-		return TPromise.as(true);
+		return Promise.resolve(true);
 	}
 
 	readCredential(credentialId: string): Thenable<azdata.Credential> {
-		return TPromise.as(this.storedCredentials[credentialId]);
+		return Promise.resolve(this.storedCredentials[credentialId]);
 	}
 
 	deleteCredential(credentialId: string): Thenable<boolean> {
 		let exists = this.storedCredentials[credentialId] !== undefined;
 		delete this.storedCredentials[credentialId];
-		return TPromise.as(exists);
+		return Promise.resolve(exists);
 	}
 }