Skip to content

Commit 53698d1

Browse files
authored
Merge pull request #1013 from softworkz/submit_timeout
Double-up timeout for electron-builder and other fixes
2 parents 04a224a + 17f761d commit 53698d1

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/ElectronNET.API/API/ApiBase.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,9 @@ public Invocator(ApiBase apiBase, string callerName, TimeSpan timeout, object ar
314314
{
315315
if (this.tcs != null)
316316
{
317-
var ex = new TimeoutException($"No response after {timeout:D}ms trying to retrieve value {apiBase.objectName}.{callerName}()");
317+
var ex = new TimeoutException(
318+
$"No response after {(long)timeout.TotalMilliseconds}ms trying to retrieve value {apiBase.objectName}.{callerName}()"
319+
);
318320
this.tcs.TrySetException(ex);
319321
this.tcs = null;
320322
}

src/ElectronNET.Host/ElectronNET.Host.esproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.4110890">
1+
<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.3864779">
22
<ItemGroup>
33
<None Include=".vscode\tasks.json" />
44
</ItemGroup>

src/ElectronNET/build/ElectronNET.LateImport.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ For more information, see: https://github.com/ElectronNET/Electron.NET/wiki/Migr
522522
<_NpxCmd Condition="'$(IsLinuxWsl)' == 'true'">wsl bash -ic '$(_NpxCmd)'</_NpxCmd>
523523
</PropertyGroup>
524524

525-
<Exec Command="$(_NpxCmd)" WorkingDirectory="$(ElectronPublishDirFullPath)" Timeout="900000" StandardOutputImportance="High" StandardErrorImportance="High" ContinueOnError="false" Condition="@(CopiedFiles->Count()) > 0">
525+
<Exec Command="$(_NpxCmd)" WorkingDirectory="$(ElectronPublishDirFullPath)" Timeout="1800000" StandardOutputImportance="High" StandardErrorImportance="High" ContinueOnError="false" Condition="@(CopiedFiles->Count()) > 0">
526526
<Output TaskParameter="ExitCode" PropertyName="ExecExitCode"/>
527527
</Exec>
528528

0 commit comments

Comments
 (0)