diff options
author | Bob Arnson <bob@firegiant.com> | 2020-05-07 21:43:35 -0400 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2020-05-07 21:45:00 -0400 |
commit | 45a46d9175aa29c526e22bf6193837543610bb37 (patch) | |
tree | dd8b84442598d482b8b62135e2bfc0d714199f37 | |
parent | 5eabd27e1af2827228b1ed925664bc15d9035484 (diff) | |
download | wix-45a46d9175aa29c526e22bf6193837543610bb37.tar.gz wix-45a46d9175aa29c526e22bf6193837543610bb37.tar.bz2 wix-45a46d9175aa29c526e22bf6193837543610bb37.zip |
Remove timeout on WixNative*.exe to avoid judging on build time.
-rw-r--r-- | src/WixToolset.Core.Native/WixNativeExe.cs | 21 |
1 files changed, 6 insertions, 15 deletions
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 | |||
11 | 11 | ||
12 | internal class WixNativeExe | 12 | internal class WixNativeExe |
13 | { | 13 | { |
14 | private const int TenMinutesInMilliseconds = 600000; | ||
15 | private static string PathToWixNativeExe; | 14 | private static string PathToWixNativeExe; |
16 | 15 | ||
17 | private readonly string commandLine; | 16 | private readonly string commandLine; |
@@ -63,22 +62,14 @@ namespace WixToolset.Core.Native | |||
63 | process.StandardInput.WriteLine(); | 62 | process.StandardInput.WriteLine(); |
64 | } | 63 | } |
65 | 64 | ||
66 | if (process.WaitForExit(TenMinutesInMilliseconds)) | 65 | // If the process successfully exits documentation says we need to wait again |
67 | { | 66 | // without a timeout to ensure that all of the redirected output is captured. |
68 | // If the process successfully exits documentation says we need to wait again | 67 | // |
69 | // without a timeout to ensure that all of the redirected output is captured. | 68 | process.WaitForExit(); |
70 | // | ||
71 | process.WaitForExit(); | ||
72 | 69 | ||
73 | if (process.ExitCode != 0) | 70 | if (process.ExitCode != 0) |
74 | { | ||
75 | throw new Win32Exception(process.ExitCode); | ||
76 | } | ||
77 | } | ||
78 | else | ||
79 | { | 71 | { |
80 | process.Kill(); | 72 | throw new Win32Exception(process.ExitCode); |
81 | throw new Win32Exception(1460/*ERROR_TIMEOUT*/); | ||
82 | } | 73 | } |
83 | } | 74 | } |
84 | 75 | ||