Merge pull request #383 from microsoft/dev/daeunyim/revert-service-do…

…wnloader

Revert service downloader to old one

.pipeline/release-pipeline.yml

@@ -20,7 +20,7 @@ steps:
     script: |
       yarn install
       yarn run compile
-      yarn run package-offline
+      yarn run package
 - task: EsrpCodeSigning@2
   displayName: 'Code Signing'
   inputs:

package.json

@@ -419,7 +419,7 @@
     }
   },
   "dependencies": {
-    "@microsoft/ads-service-downloader": "^1.1.0",
+    "service-downloader": "github:daeunyim/service-downloader#0.1.1",
     "@microsoft/ads-extension-telemetry": "^1.3.4",
     "crypto": "^1.0.1",
     "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.1",

src/config.json

@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/pgtoolsservice/releases/download/{#version#}/pgsqltoolsservice-{#fileName#}",
-	"version": "v1.6.0-alpha",
+	"version": "v1.7.0",
 	"downloadFileNames": {
 		"Windows_64": "win-x64.zip",
 		"Windows_86": "win-x86.zip",

src/main.ts

@@ -7,7 +7,7 @@
 import * as vscode from 'vscode';
 import * as path from 'path';
 import { SqlOpsDataClient, ClientOptions } from 'dataprotocol-client';
-import { IConfig, ServerProvider, Events } from '@microsoft/ads-service-downloader';
+import { IConfig, ServerProvider, Events } from 'service-downloader';
 import { ServerOptions, TransportKind } from 'vscode-languageclient';
 
 import * as Constants from './constants';

tasks/packagetasks.js

@@ -5,7 +5,7 @@ var cproc = require('child_process');
 var os = require('os');
 var del = require('del');
 var path = require('path');
-var serviceDownloader = require('@microsoft/ads-service-downloader');
+var serviceDownloader = require('service-downloader');
 
 
 function getServiceInstallConfig() {
@@ -70,10 +70,27 @@ function doOfflinePackage(runtimeId, runtime, packageName) {
 
 //Install vsce to be able to run this task: npm install -g vsce
 gulp.task('package:online', () => {
-    return cleanServiceInstallFolder().then(() => {
-         doPackageSync();
-         return getOrDownloadServer();
+    var json = JSON.parse(fs.readFileSync('package.json'));
+    var name = json.name;
+    var version = json.version;
+    var packageName = name + '-' + version;
+
+    var packages = [];
+    packages.push({rid: 'win-x64', runtime: 'Windows_64'});
+    packages.push({rid: 'osx', runtime: 'OSX'});
+    packages.push({rid: 'osx-arm64', runtime: 'OSX_ARM64'});
+
+    var promise = cleanServiceInstallFolder();
+
+    packages.forEach(data => {
+        promise = promise.then(() => {
+            return cleanServiceInstallFolder().then(() => {
+                return doPackageSync(packageName + '-' + data.rid + '.vsix');
+            });
+        });
     });
+
+    return promise;
 });
 
 //Install vsce to be able to run this task: npm install -g vsce