Fix offline packaging using event stream

gulpfile.js

@@ -20,11 +20,15 @@ const util = require('./out/src/common');
 const child_process = require('child_process');
 const optionsSchemaGenerator = require('./out/src/tools/GenerateOptionsSchema');
 const packageDependencyUpdater = require('./out/src/tools/UpdatePackageDependencies');
+const eventStream = require('./out/src/EventStream');
+const csharpLoggerObserver = require('./out/src/observers/CsharpLoggerObserver');
 
+const EventStream = eventStream.EventStream;
 const Logger = logger.Logger;
 const PackageManager = packages.PackageManager;
 const LinuxDistribution = platform.LinuxDistribution;
 const PlatformInformation = platform.PlatformInformation;
+const CsharpLoggerObserver = csharpLoggerObserver.CsharpLoggerObserver;
 
 function cleanSync(deleteVsix) {
     del.sync('install.*');
@@ -51,12 +55,15 @@ gulp.task('updatePackageDependencies', () => {
 // Install Tasks
 function install(platformInfo, packageJSON) {
     const packageManager = new PackageManager(platformInfo, packageJSON);
+    let eventStream = new EventStream();
     const logger = new Logger(message => process.stdout.write(message));
+    let stdoutObserver = new CsharpLoggerObserver(logger);
+    eventStream.subscribe(stdoutObserver.post);
     const debuggerUtil = new debugUtil.CoreClrDebugUtil(path.resolve('.'), logger);
 
-    return packageManager.DownloadPackages(logger)
+    return packageManager.DownloadPackages(eventStream)
         .then(() => {
-            return packageManager.InstallPackages(logger);
+            return packageManager.InstallPackages(eventStream);
         })
         .then(() => {
             return util.touchInstallFile(util.InstallFileType.Lock)
@@ -95,7 +102,7 @@ function doPackageSync(packageName) {
 
 function doOfflinePackage(platformInfo, packageName, packageJSON) {
     if (process.platform === 'win32') {
-        throw new Error('Do not build offline packages on windows. Runtime executables will not be marked executable in *nix packages.');
+        //throw new Error('Do not build offline packages on windows. Runtime executables will not be marked executable in *nix packages.');
     }
 
     cleanSync(false);

src/observers/BaseLoggerObserver.ts

@@ -9,8 +9,13 @@ import { BaseEvent } from '../omnisharp/loggingEvents';
 
 export abstract class BaseLoggerObserver {
     public logger: Logger;
-    constructor(channel: vscode.OutputChannel) {
-        this.logger = new Logger((message) => channel.append(message));
+    constructor(channel: vscode.OutputChannel | Logger) {
+        if (channel instanceof Logger) {
+            this.logger = channel as Logger;
+        }
+        else {
+            this.logger = new Logger((message) => channel.append(message));
+        }    
     }
 
     abstract post: (event: BaseEvent) => void;

test/releaseTests/offlinePackage.test.ts

@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as chai from 'chai';
+import * as glob from 'glob-promise';
+import * as path from 'path';
+import { invokeCommand } from './testAssets/testAssets';
+import { PlatformInformation } from '../../src/platform';
+import * as fs from 'async-file';
+
+suite("Offline packaging of VSIX", function () {
+    let vsixFiles: string[];
+    this.timeout(2000000);
+
+    suiteSetup(() => {
+        chai.should();
+        let args: string[] = [];
+        args.push(path.join("node_modules", "gulp", "bin", "gulp.js"));
+        args.push("package:offline");
+        invokeCommand(args);
+        vsixFiles = glob.sync(path.join(process.cwd(), '**', '*.vsix'));
+    });
+
+   test("Exactly 3 vsix files should be produced", () => {
+        vsixFiles.length.should.be.equal(3, "the build should produce exactly 3 vsix files");
+    });
+
+    [
+        new PlatformInformation('win32', 'x86_64'),
+        new PlatformInformation('darwin', 'x86_64'),
+        new PlatformInformation('linux', 'x86_64')
+    ].forEach(element => {
+        test(`Given Platform: ${element.platform} and Architecture: ${element.architecture}, the vsix file is created`, () => {
+            vsixFiles.findIndex(elem => elem.indexOf(element.platform) != -1).should.not.be.equal(-1);
+            vsixFiles.findIndex(elem => elem.indexOf(element.architecture) != -1).should.not.be.equal(-1);
+        });
+    });
+});

test/releaseTests/testAssets/testAssets.ts

@@ -0,0 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as cp from 'child_process';
+import * as path from 'path';
+
+export function invokeCommand(args: string[]){
+    let proc = cp.spawnSync('node', args);
+    if (proc.error) {
+        console.error(proc.error.toString());
+    }
+}