Fixed extraction of arguments

Author: danatcofo

ElectronNET.CLI/Commands/BuildCommand.cs

@@ -23,7 +23,7 @@ public class BuildCommand : ICommand
                                                  "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 +
-                                                 "Optional: '-- [-a|--arch <ARCHITECTURE>] [-f | --framework<FRAMEWORK>] [--force] [--no-dependencies] [--no-incremental] [--no-restore] [--nologo]" + Environment.NewLine +
+                                                 "Optional: '/dotnet-publish [-a|--arch <ARCHITECTURE>] [-f | --framework<FRAMEWORK>] [--force] [--no-dependencies] [--no-incremental] [--no-restore] [--nologo]" + Environment.NewLine +
                                                  "           [--no-self-contained] [--os <OS>] [--self-contained [true|false]] [--source <SOURCE>] [-v|--verbosity <LEVEL>] [--version-suffix <VERSION_SUFFIX>]'" + Environment.NewLine + 
                                                  "          to add additional dot net publish arguments." + 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 \"";
@@ -49,6 +49,7 @@ public BuildCommand(string[] args)
         private string _paramPublishReadyToRun = "PublishReadyToRun";
         private string _paramPublishSingleFile = "PublishSingleFile";
         private string _paramVersion = "Version";
+        private string _paramDotNetPublish = "dotnet-publish";
 
         public Task<bool> ExecuteAsync()
         {
@@ -113,7 +114,7 @@ public Task<bool> ExecuteAsync()
                     $"dotnet publish -r {platformInfo.NetCorePublishRid} -c \"{configuration}\" --output \"{tempBinPath}\" {string.Join(' ', dotNetPublishFlags.Select(kvp => $"{kvp.Key}={kvp.Value}"))}";
 
                 // add any additional dotnet flags
-                var dotnetFlags = GetDotNetArgs(_args);
+                var dotnetFlags = GetDotNetArgs(parser);
                 if (dotnetFlags.Any())
                 {
                     command += " " + string.Join(" ", dotnetFlags);
@@ -224,19 +225,14 @@ public Task<bool> ExecuteAsync()
         {
             "--interactive", "-h", "--help"
         };
-        private List<string> GetDotNetArgs(string[] args)
+        private List<string> GetDotNetArgs(SimpleCommandLineParser parser)
         {
-            if (!args.Contains("--")) return new List<string> { "--self-contained" };
+            if (!parser.TryGet(_paramDotNetPublish, out var args)) return new List<string> { "--self-contained" };
 
             var list = args
-                .SkipWhile(i => "--".Equals(i, StringComparison.OrdinalIgnoreCase))
-                .Skip(1)
                 .Except(DotNetFlagsToIgnore)
                 .ToList();
 
-            // ensure the args flag is removed
-            list.Remove("--");
-
             // remove flags that are handled by design
             foreach (var flag in DotNetFlagsWithValuesReserved)
             {

README.md

@@ -150,10 +150,10 @@ electronize build /target custom "win7-x86;win32" /electron-arch ia32
 
 ### Additional DotNet Publish Flags
 
-For certain scenarios additional `dotnet publish` arguments may be required. To add additional publish flags use the `--` flag at the end of your command and add any additional publish flags after. For example if you want to skip the default nuget restore you can do that like this:
+For certain scenarios additional `dotnet publish` arguments may be required. To add additional publish flags use the `/dotnet-publish` flag and add any additional publish flags after. For example if you want to skip the default nuget restore you can do that like this:
 
 ```
-electronize build /target osx -- --no-restore
+electronize build /target osx /dotnet-publish --no-restore
 ```
 
 #### Self-Contained