Skip to content

Added new build and start commandline options for single exe #506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GregorBiswanger merged 1 commit into from
Jan 10, 2021
Merged

Added new build and start commandline options for single exe #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions ElectronNET.CLI/Commands/BuildCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class BuildCommand : ICommand
"Optional: '/relative-path' to specify output a subdirectory for output." + Environment.NewLine +
"Optional: '/absolute-path to specify and absolute path for output." + Environment.NewLine +
"Optional: '/package-json' to specify a custom package.json file." + Environment.NewLine +
"Optional: '/install-modules' to force node module install. Implied by '/package-json'" + Environment.NewLine +
"Optional: '/install-modules' to force node module install. Implied by '/package-json'" + 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 \"";

public static IList<CommandOption> CommandOptions { get; set; } = new List<CommandOption>();
Expand All @@ -42,6 +42,7 @@ public BuildCommand(string[] args)
private string _paramForceNodeInstall = "install-modules";
private string _manifest = "manifest";
private string _paramPublishReadyToRun = "PublishReadyToRun";
private string _paramPublishSingleFile = "PublishSingleFile";

public Task<bool> ExecuteAsync()
{
Expand Down Expand Up @@ -77,17 +78,17 @@ public Task<bool> ExecuteAsync()
Console.WriteLine($"Build ASP.NET Core App for {platformInfo.NetCorePublishRid}...");

string tempPath = Path.Combine(Directory.GetCurrentDirectory(), "obj", "desktop", desiredPlatform);

if (Directory.Exists(tempPath) == false)
{
Directory.CreateDirectory(tempPath);
}
}
else
{
Directory.Delete(tempPath, true);
Directory.CreateDirectory(tempPath);
}


Console.WriteLine("Executing dotnet publish in this directory: " + tempPath);

Expand All @@ -99,13 +100,23 @@ public Task<bool> ExecuteAsync()
if (parser.Arguments.ContainsKey(_paramPublishReadyToRun))
{
publishReadyToRun += parser.Arguments[_paramPublishReadyToRun][0];
}
}
else
{
publishReadyToRun += "true";
}

var resultCode = ProcessHelper.CmdExecute($"dotnet publish -r {platformInfo.NetCorePublishRid} -c \"{configuration}\" --output \"{tempBinPath}\" {publishReadyToRun} --self-contained", Directory.GetCurrentDirectory());
string publishSingleFile = "/p:PublishSingleFile=";
if (parser.Arguments.ContainsKey(_paramPublishSingleFile))
{
publishSingleFile += parser.Arguments[_paramPublishSingleFile][0];
}
else
{
publishSingleFile += "true";
}

var resultCode = ProcessHelper.CmdExecute($"dotnet publish -r {platformInfo.NetCorePublishRid} -c \"{configuration}\" --output \"{tempBinPath}\" {publishReadyToRun} {publishSingleFile} --self-contained", Directory.GetCurrentDirectory());

if (resultCode != 0)
{
Expand All @@ -127,7 +138,7 @@ public Task<bool> ExecuteAsync()

if (Directory.Exists(checkForNodeModulesDirPath) == false || parser.Contains(_paramForceNodeInstall) || parser.Contains(_paramPackageJson))

Console.WriteLine("Start npm install...");
Console.WriteLine("Start npm install...");
ProcessHelper.CmdExecute("npm install --production", tempPath);

Console.WriteLine("ElectronHostHook handling started...");
Expand Down Expand Up @@ -156,7 +167,7 @@ public Task<bool> ExecuteAsync()
}
else if (parser.Arguments.ContainsKey(_paramOutputDirectory))
{
buildPath = Path.Combine(Directory.GetCurrentDirectory(),parser.Arguments[_paramOutputDirectory][0]);
buildPath = Path.Combine(Directory.GetCurrentDirectory(), parser.Arguments[_paramOutputDirectory][0]);
}

Console.WriteLine("Executing electron magic in this directory: " + buildPath);
Expand All @@ -178,7 +189,7 @@ public Task<bool> ExecuteAsync()

string manifestFileName = "electron.manifest.json";

if(parser.Arguments.ContainsKey(_manifest))
if (parser.Arguments.ContainsKey(_manifest))
{
manifestFileName = parser.Arguments[_manifest].First();
}
Expand All @@ -194,4 +205,4 @@ public Task<bool> ExecuteAsync()
});
}
}
}
}
15 changes: 13 additions & 2 deletions ElectronNET.CLI/Commands/StartElectronCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public StartElectronCommand(string[] args)
private string _manifest = "manifest";
private string _clearCache = "clear-cache";
private string _paramPublishReadyToRun = "PublishReadyToRun";
private string _paramPublishSingleFile = "PublishSingleFile";
private string _paramDotNetConfig = "dotnet-configuration";
private string _paramTarget = "target";

Expand Down Expand Up @@ -73,8 +74,18 @@ public Task<bool> ExecuteAsync()
publishReadyToRun += "true";
}

string publishSingleFile = "/p:PublishSingleFile=";
if (parser.Arguments.ContainsKey(_paramPublishSingleFile))
{
publishSingleFile += parser.Arguments[_paramPublishSingleFile][0];
}
else
{
publishSingleFile += "true";
}

// If target is specified as a command line argument, use it.
// Format is the same as the build command.
// Format is the same as the build command.
// If target is not specified, autodetect it.
var platformInfo = GetTargetPlatformInformation.Do(string.Empty, string.Empty);
if (parser.Arguments.ContainsKey(_paramTarget))
Expand All @@ -96,7 +107,7 @@ public Task<bool> ExecuteAsync()

if (parser != null && !parser.Arguments.ContainsKey("watch"))
{
resultCode = ProcessHelper.CmdExecute($"dotnet publish -r {platformInfo.NetCorePublishRid} -c \"{configuration}\" --output \"{tempBinPath}\" {publishReadyToRun} --no-self-contained", aspCoreProjectPath);
resultCode = ProcessHelper.CmdExecute($"dotnet publish -r {platformInfo.NetCorePublishRid} -c \"{configuration}\" --output \"{tempBinPath}\" {publishReadyToRun} {publishSingleFile} --no-self-contained", aspCoreProjectPath);
}

if (resultCode != 0)
Expand Down