Merge pull request #33 from Microsoft/akamath46297/release0.2.0

Updated the platform
microsoft · Apr 9, 2019 · 9306f65 · 9306f65
2 parents b73cb15 + fa8c03e
commit 9306f65
Show file tree

Hide file tree

Showing 13 changed files with 1,479 additions and 1,200 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -92,7 +92,7 @@
     "yargs": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"
   },
   "dependencies": {
-    "applicationinsights": "^0.15.9",
+    "applicationinsights": "^1.0.8",
     "body-parser": "^1.15.2",
     "comment-json": "^1.1.3",
     "copy-paste": "^1.3.0",
@@ -113,7 +113,7 @@
     "semver": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
     "tmp": "^0.0.28",
     "underscore": "^1.8.3",
-    "vscode-extension-telemetry": "^0.0.5",
+    "vscode-extension-telemetry": "^0.1.1",
     "vscode-languageclient": "^3.5.1",
     "vscode-nls": "^2.0.2",
     "ws": "^1.1.1"

diff --git a/src/configurations/dev.config.json b/src/configurations/dev.config.json
@@ -3,10 +3,17 @@
         "downloadUrl": "https://github.com/Microsoft/pgtoolsservice/releases/download/{#version#}/pgsqltoolsservice-{#fileName#}",
         "version": "v1.0.0",
         "downloadFileNames": {
-            "Windows_64": "win-x64.zip",
-            "Windows_86": "win-x86.zip",
-            "OSX": "osx.tar.gz",
-            "Linux_64": "linux-x64.tar.gz"
+            "Windows_7_86": "win-x86.zip",
+            "Windows_7_64": "win-x64.zip",
+            "OSX_10_11_64": "osx.tar.gz",
+            "CentOS_7": "linux-x64.tar.gz",
+            "Debian_8": "linux-x64.tar.gz",
+            "Fedora_23": "linux-x64.tar.gz",
+            "OpenSUSE_13_2": "linux-x64.tar.gz",
+            "SLES_12_2": "linux-x64.tar.gz",
+            "RHEL_7": "linux-x64.tar.gz",
+            "Ubuntu_14": "linux-x64.tar.gz",
+            "Ubuntu_16": "linux-x64.tar.gz"
         },
         "installDir": "../pgsqltoolsservice/{#version#}/{#platform#}",
         "executableFiles": [

diff --git a/src/configurations/production.config.json b/src/configurations/production.config.json
@@ -3,10 +3,17 @@
         "downloadUrl": "https://github.com/Microsoft/pgtoolsservice/releases/download/{#version#}/pgsqltoolsservice-{#fileName#}",
         "version": "v1.0.0",
         "downloadFileNames": {
-            "Windows_64": "win-x64.zip",
-            "Windows_86": "win-x86.zip",
-            "OSX": "osx.tar.gz",
-            "Linux_64": "linux-x64.tar.gz"
+            "Windows_7_86": "win-x86.zip",
+            "Windows_7_64": "win-x64.zip",
+            "OSX_10_11_64": "osx.tar.gz",
+            "CentOS_7": "linux-x64.tar.gz",
+            "Debian_8": "linux-x64.tar.gz",
+            "Fedora_23": "linux-x64.tar.gz",
+            "OpenSUSE_13_2": "linux-x64.tar.gz",
+            "SLES_12_2": "linux-x64.tar.gz",
+            "RHEL_7": "linux-x64.tar.gz",
+            "Ubuntu_14": "linux-x64.tar.gz",
+            "Ubuntu_16": "linux-x64.tar.gz"
         },
         "installDir": "../pgsqltoolsservice/{#version#}/{#platform#}",
         "executableFiles": [

diff --git a/src/controllers/connectionManager.ts b/src/controllers/connectionManager.ts
@@ -333,7 +333,7 @@ export default class ConnectionManager {
             connection.errorNumber = result.errorNumber;
             connection.errorMessage = result.errorMessage;
         } else {
-            PlatformInformation.getCurrent().then( platformInfo => {
+            PlatformInformation.GetCurrent().then( platformInfo => {
                 if (!platformInfo.isWindows && result.errorMessage && result.errorMessage.includes('Kerberos')) {
                     this.vscodeWrapper.showErrorMessage(
                         Utils.formatString(LocalizedConstants.msgConnectionError2, result.errorMessage),
@@ -343,7 +343,7 @@ export default class ConnectionManager {
                             opener(Constants.integratedAuthHelpLink);
                         }
                      });
-                } else if (platformInfo.runtimeId === Runtime.OSX &&
+                } else if (platformInfo.runtimeId === Runtime.OSX_10_11_64  &&
                 result.messages.indexOf('Unable to load DLL \'System.Security.Cryptography.Native\'') !== -1) {
                      this.vscodeWrapper.showErrorMessage(Utils.formatString(LocalizedConstants.msgConnectionError2,
                      LocalizedConstants.macOpenSslErrorMessage), LocalizedConstants.macOpenSslHelpButton).then(action => {

diff --git a/src/languageservice/serviceInstallerUtil.ts b/src/languageservice/serviceInstallerUtil.ts
@@ -63,7 +63,7 @@ let serverProvider = new  ServerProvider(downloadProvider, config, statusView);
 */
 export function installService(runtime: Runtime): Promise<String> {
     if (runtime === undefined) {
-        return PlatformInformation.getCurrent().then( platformInfo => {
+        return PlatformInformation.GetCurrent().then( platformInfo => {
             if (platformInfo.isValidRuntime) {
                 return serverProvider.getOrDownloadServer(platformInfo.runtimeId);
             } else {
@@ -81,7 +81,7 @@ export function installService(runtime: Runtime): Promise<String> {
 export function getServiceInstallDirectory(runtime: Runtime): Promise<string> {
     return new Promise<string>((resolve, reject) => {
         if (runtime === undefined) {
-            PlatformInformation.getCurrent().then( platformInfo => {
+            PlatformInformation.GetCurrent().then( platformInfo => {
                 if (platformInfo.isValidRuntime) {
                     resolve(downloadProvider.getInstallDirectory(platformInfo.runtimeId));
                 } else {

diff --git a/src/languageservice/serviceclient.ts b/src/languageservice/serviceclient.ts
@@ -156,7 +156,7 @@ export default class SqlToolsServiceClient {
     public initialize(context: ExtensionContext): Promise<ServerInitializationResult> {
          this._logger.appendLine(Constants.serviceInitializing);
 
-         return PlatformInformation.getCurrent().then( platformInfo => {
+         return PlatformInformation.GetCurrent().then( platformInfo => {
             return this.initializeForPlatform(platformInfo, context);
          });
     }