Merge branch 'master' into switch-to-new-socket-lib

This commit is contained in:
Gregor Biswanger
2022-04-06 16:23:47 +02:00
committed by GitHub
3 changed files with 14 additions and 5 deletions

View File

@@ -23,7 +23,8 @@ namespace ElectronNET.CLI.Commands
"Optional: '/install-modules' to force node module install. Implied by '/package-json'" + Environment.NewLine +
"Optional: '/Version' to specify the version that should be applied to both the `dotnet publish` and `electron-builder` commands. Implied by '/Version'" + Environment.NewLine +
"Optional: '/p:[property]' or '/property:[property]' to pass in dotnet publish properties. Example: '/property:Version=1.0.0' to override the FileVersion" + Environment.NewLine +
"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 \"";
"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 +
"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 \"";
public static IList<CommandOption> CommandOptions { get; set; } = new List<CommandOption>();
@@ -62,7 +63,7 @@ namespace ElectronNET.CLI.Commands
if (parser.Arguments.ContainsKey(_paramVersion))
version = parser.Arguments[_paramVersion][0];
if (!parser.Arguments.ContainsKey(_paramTarget))
if (!parser.Arguments.ContainsKey(_paramTarget) || parser.Arguments[_paramTarget].Length == 0)
{
Console.WriteLine($"Error: missing '{_paramTarget}' argument.");
Console.WriteLine(COMMAND_ARGUMENTS);
@@ -260,4 +261,4 @@ namespace ElectronNET.CLI.Commands
return dotNetPublishFlags;
}
}
}
}

View File

@@ -360,6 +360,10 @@ function startAspCoreBackend(electronPort) {
console.log('Detached from ASP.NET process');
apiProcess.unref();
}
apiProcess.stderr.on('data', (data) => {
console.log(`stderr: ${data.toString()}`);
});
}
}
@@ -414,6 +418,10 @@ function startAspCoreBackendWithWatch(electronPort) {
console.log('Detached from ASP.NET process');
apiProcess.unref();
}
apiProcess.stderr.on('data', (data) => {
console.log(`stderr: ${data.toString()}`);
});
}
}

View File

@@ -188,9 +188,9 @@ MIT-licensed
## 📝 Important notes
### ElectronNET.API & ElectronNET.CLI Version 9.31.2
### ElectronNET.API & ElectronNET.CLI Version 13.5.1
Make sure you also have the new Electron.NET API & CLI 9.31.2 version.
Make sure you also have the new Electron.NET API & CLI 13.5.1 version.
```
dotnet tool update ElectronNET.CLI -g