From 8ed278b0b5c31fb62a5c03d7de4fcaa6db63fc9c Mon Sep 17 00:00:00 2001
From: Karol Zadora-Przylecki <karolz@microsoft.com>
Date: Mon, 28 Nov 2022 17:41:10 +0000
Subject: [PATCH] Fix issue 3709 (#3712)

* Fix issue 3709

Fixes https://github.com/microsoft/vscode-docker/issues/3709 by:
- increasing the timeout to 20 seconds (the previous 10 seconds might be a bit short in a case of a freshly-started machine with low RAM and slow disk)
- improving error handling in case a process is terminated due to a signal
---
 src/runtimes/docker/utils/spawnStreamAsync.ts |  2 ++
 src/utils/netCoreUtils.ts                     | 11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/runtimes/docker/utils/spawnStreamAsync.ts b/src/runtimes/docker/utils/spawnStreamAsync.ts
index 52b82acc6d..e2fe3b168e 100644
--- a/src/runtimes/docker/utils/spawnStreamAsync.ts
+++ b/src/runtimes/docker/utils/spawnStreamAsync.ts
@@ -195,6 +195,8 @@ export async function spawnStreamAsync(
             disposable.dispose();
             if (code === 0) {
                 resolve();
+            } else if (signal) {
+                reject(new ChildProcessError(`Process exited due to signal ${signal}`, code, signal));
             } else {
                 reject(new ChildProcessError(`Process exited with code ${code}`, code, signal));
             }
diff --git a/src/utils/netCoreUtils.ts b/src/utils/netCoreUtils.ts
index 8a6e5b8776..db0408cc2c 100644
--- a/src/utils/netCoreUtils.ts
+++ b/src/utils/netCoreUtils.ts
@@ -9,6 +9,7 @@ import { ext } from '../extensionVariables';
 import { localize } from '../localize';
 import { getTempFileName } from './osUtils';
 import { execAsync } from './execAsync';
+import { parseError } from '@microsoft/vscode-azext-utils';
 
 export async function getNetCoreProjectInfo(target: 'GetBlazorManifestLocations' | 'GetProjectProperties', project: string): Promise<string[]> {
     const targetsFile = path.join(ext.context.asAbsolutePath('resources'), 'netCore', `${target}.targets`);
@@ -17,7 +18,13 @@ export async function getNetCoreProjectInfo(target: 'GetBlazorManifestLocations'
     const command = `dotnet build /r:false /t:${target} /p:CustomAfterMicrosoftCommonTargets="${targetsFile}" /p:CustomAfterMicrosoftCommonCrossTargetingTargets="${targetsFile}" /p:InfoOutputPath="${outputFile}" "${project}"`;
 
     try {
-        await execAsync(command, { timeout: 10000 });
+        try {
+            await execAsync(command, { timeout: 20000 });
+        } catch (err) {
+            const error = parseError(err);
+            throw new Error(localize('vscode-docker.netCoreUtils.noProjectInfo', 'Unable to determine project information for target \'{0}\' on project \'{1}\' {2}', target, project, error.message));
+        }
+
 
         if (await fse.pathExists(outputFile)) {
             const contents = await fse.readFile(outputFile, 'utf-8');
@@ -27,7 +34,7 @@ export async function getNetCoreProjectInfo(target: 'GetBlazorManifestLocations'
             }
         }
 
-        throw new Error(localize('vscode-docker.netCoreUtils.noProjectInfo', 'Unable to determine project information for target \'{0}\' on project \'{1}\'', target, project));
+        throw new Error(localize('vscode-docker.netCoreUtils.noProjectInfo2', 'Unable to determine project information for target \'{0}\' on project \'{1}\'', target, project));
     } finally {
         if (await fse.pathExists(outputFile)) {
             await fse.unlink(outputFile);