Fixup remaining usage of downloadAndInstallPackages

Author: JoeRobich

src/main.ts

@@ -17,7 +17,7 @@ import { vscodeNetworkSettingsProvider } from './networkSettings';
 import createOptionStream from './shared/observables/createOptionStream';
 import { AbsolutePathPackage } from './packageManager/absolutePathPackage';
 import { downloadAndInstallPackages } from './packageManager/downloadAndInstallPackages';
-import IInstallDependencies from './packageManager/IInstallDependencies';
+import { IInstallDependencies } from './packageManager/IInstallDependencies';
 import { installRuntimeDependencies } from './installRuntimeDependencies';
 import { isValidDownload } from './packageManager/isValidDownload';
 import { MigrateOptions } from './shared/migrateOptions';

src/omnisharp/omnisharpDownloader.ts

@@ -53,15 +53,17 @@ export class OmnisharpDownloader {
         if (packagesToInstall.length > 0) {
             this.eventStream.post(new PackageInstallation(`OmniSharp Version = ${version}`));
             this.eventStream.post(new LogPlatformInfo(this.platformInfo));
-            if (
-                await downloadAndInstallPackages(
-                    packagesToInstall,
-                    this.networkSettingsProvider,
-                    this.eventStream,
-                    isValidDownload,
-                    this.reporter
-                )
-            ) {
+            const installationResults = await downloadAndInstallPackages(
+                packagesToInstall,
+                this.networkSettingsProvider,
+                this.eventStream,
+                isValidDownload,
+                this.reporter
+            );
+            const failedPackages = Object.entries(installationResults)
+                .filter(([, installed]) => !installed)
+                .map(([name]) => name);
+            if (failedPackages.length === 0) {
                 this.eventStream.post(new InstallationSuccess());
                 return true;
             }

src/razor/razorOmnisharpDownloader.ts

@@ -35,15 +35,17 @@ export class RazorOmnisharpDownloader {
         if (packagesToInstall.length > 0) {
             this.eventStream.post(new PackageInstallation(`Razor OmniSharp Version = ${version}`));
             this.eventStream.post(new LogPlatformInfo(this.platformInfo));
-            if (
-                await downloadAndInstallPackages(
-                    packagesToInstall,
-                    this.networkSettingsProvider,
-                    this.eventStream,
-                    isValidDownload,
-                    this.reporter
-                )
-            ) {
+            const installationResults = await downloadAndInstallPackages(
+                packagesToInstall,
+                this.networkSettingsProvider,
+                this.eventStream,
+                isValidDownload,
+                this.reporter
+            );
+            const failedPackages = Object.entries(installationResults)
+                .filter(([, installed]) => !installed)
+                .map(([name]) => name);
+            if (failedPackages.length === 0) {
                 this.eventStream.post(new InstallationSuccess());
                 return true;
             }

tasks/offlinePackagingTasks.ts

@@ -280,10 +280,19 @@ async function installPackageJsonDependency(
         codeExtensionPath
     );
     const provider = () => new NetworkSettings('', true);
-    if (
-        !(await downloadAndInstallPackages(packagesToInstall, provider, eventStream, isValidDownload, undefined, token))
-    ) {
-        throw Error('Failed to download package.');
+    const installationResults = await downloadAndInstallPackages(
+        packagesToInstall,
+        provider,
+        eventStream,
+        isValidDownload,
+        undefined,
+        token
+    );
+    const failedPackages = Object.entries(installationResults)
+        .filter(([, installed]) => !installed)
+        .map(([name]) => name);
+    if (failedPackages.length > 0) {
+        throw Error('The following packages failed to install: ' + failedPackages.join(', '));
     }
 }