Skip to content

Commit 891870a

Browse files
Merge branch 'master' into switch-to-new-socket-lib
2 parents 18d425b + ab162d4 commit 891870a

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

ElectronNET.CLI/Commands/BuildCommand.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public class BuildCommand : ICommand
2323
"Optional: '/install-modules' to force node module install. Implied by '/package-json'" + Environment.NewLine +
2424
"Optional: '/Version' to specify the version that should be applied to both the `dotnet publish` and `electron-builder` commands. Implied by '/Version'" + Environment.NewLine +
2525
"Optional: '/p:[property]' or '/property:[property]' to pass in dotnet publish properties. Example: '/property:Version=1.0.0' to override the FileVersion" + Environment.NewLine +
26-
"Full example for a 32bit debug build with electron prune: build /target custom win7-x86;win32 /dotnet-configuration Debug /electron-arch ia32 /electron-params \"--prune=true \"";
26+
"Full example for a 32bit debug build with electron prune: build /target custom win7-x86;win32 /dotnet-configuration Debug /electron-arch ia32 /electron-params \"--prune=true \"" + Environment.NewLine +
27+
"Full example to pass publish parameters: build /PublishReadyToRun false /PublishSingleFile false /target custom win7-x86;win32 /dotnet-configuration Debug /electron-arch ia32 /electron-params \"--prune=true \"";
2728

2829
public static IList<CommandOption> CommandOptions { get; set; } = new List<CommandOption>();
2930

@@ -62,7 +63,7 @@ public Task<bool> ExecuteAsync()
6263
if (parser.Arguments.ContainsKey(_paramVersion))
6364
version = parser.Arguments[_paramVersion][0];
6465

65-
if (!parser.Arguments.ContainsKey(_paramTarget))
66+
if (!parser.Arguments.ContainsKey(_paramTarget) || parser.Arguments[_paramTarget].Length == 0)
6667
{
6768
Console.WriteLine($"Error: missing '{_paramTarget}' argument.");
6869
Console.WriteLine(COMMAND_ARGUMENTS);
@@ -260,4 +261,4 @@ internal static Dictionary<string, string> GetDotNetPublishFlags(SimpleCommandLi
260261
return dotNetPublishFlags;
261262
}
262263
}
263-
}
264+
}

ElectronNET.Host/main.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,10 @@ function startAspCoreBackend(electronPort) {
360360
console.log('Detached from ASP.NET process');
361361
apiProcess.unref();
362362
}
363+
364+
apiProcess.stderr.on('data', (data) => {
365+
console.log(`stderr: ${data.toString()}`);
366+
});
363367
}
364368
}
365369

@@ -414,6 +418,10 @@ function startAspCoreBackendWithWatch(electronPort) {
414418
console.log('Detached from ASP.NET process');
415419
apiProcess.unref();
416420
}
421+
422+
apiProcess.stderr.on('data', (data) => {
423+
console.log(`stderr: ${data.toString()}`);
424+
});
417425
}
418426
}
419427

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ MIT-licensed
188188

189189
## 📝 Important notes
190190

191-
### ElectronNET.API & ElectronNET.CLI Version 9.31.2
191+
### ElectronNET.API & ElectronNET.CLI Version 13.5.1
192192

193-
Make sure you also have the new Electron.NET API & CLI 9.31.2 version.
193+
Make sure you also have the new Electron.NET API & CLI 13.5.1 version.
194194

195195
```
196196
dotnet tool update ElectronNET.CLI -g

0 commit comments

Comments
 (0)