From 45a46d9175aa29c526e22bf6193837543610bb37 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Thu, 7 May 2020 21:43:35 -0400 Subject: Remove timeout on WixNative*.exe to avoid judging on build time. --- src/WixToolset.Core.Native/WixNativeExe.cs | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core.Native/WixNativeExe.cs b/src/WixToolset.Core.Native/WixNativeExe.cs index afa2ed7c..935c2a89 100644 --- a/src/WixToolset.Core.Native/WixNativeExe.cs +++ b/src/WixToolset.Core.Native/WixNativeExe.cs @@ -11,7 +11,6 @@ namespace WixToolset.Core.Native internal class WixNativeExe { - private const int TenMinutesInMilliseconds = 600000; private static string PathToWixNativeExe; private readonly string commandLine; @@ -63,22 +62,14 @@ namespace WixToolset.Core.Native process.StandardInput.WriteLine(); } - if (process.WaitForExit(TenMinutesInMilliseconds)) - { - // If the process successfully exits documentation says we need to wait again - // without a timeout to ensure that all of the redirected output is captured. - // - process.WaitForExit(); + // If the process successfully exits documentation says we need to wait again + // without a timeout to ensure that all of the redirected output is captured. + // + process.WaitForExit(); - if (process.ExitCode != 0) - { - throw new Win32Exception(process.ExitCode); - } - } - else + if (process.ExitCode != 0) { - process.Kill(); - throw new Win32Exception(1460/*ERROR_TIMEOUT*/); + throw new Win32Exception(process.ExitCode); } } -- cgit v1.2.3-55-g6feb