Refactored constructors to use primary constructors.

Author: PowerCommands

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/CdCommand.cs

@@ -5,11 +5,11 @@
                         options: "bookmark|roaming",
              disableProxyOutput: true,
                         example: "//View current working directory|cd|//Traverse down one directory|//Change working directory|cd ..|cd \"C:\\ProgramData\"|//Set bookmark as the working directory using name|cd --bookmark program|//Set bookmark as the working directory using index|cd --bookmark 0|//Set first existing bookmark (if any) as working directory|cd --bookmark")]
-public class CdCommand : CommandBase<CommandsConfiguration>, IWorkingDirectoryChangesListener
+public class CdCommand(string identifier, CommandsConfiguration configuration) : CommandBase<CommandsConfiguration>(identifier, configuration), IWorkingDirectoryChangesListener
 {
     public static string WorkingDirectory = AppContext.BaseDirectory;
     public static Action<string[], string[]>? WorkingDirectoryChanged;
-    public CdCommand(string identifier, CommandsConfiguration configuration) : base(identifier, configuration) { }
+
     public override RunResult Run()
     {
         var path = WorkingDirectory;

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/ClsCommand.cs

@@ -3,9 +3,8 @@
 [PowerCommandTest(        tests: " ")]
 [PowerCommandDesign(description: "Clears the console",
              disableProxyOutput: true)]
-public class ClsCommand : CommandBase<CommandsConfiguration>
+public class ClsCommand(string identifier, CommandsConfiguration configuration) : CommandBase<CommandsConfiguration>(identifier, configuration)
 {
-    public ClsCommand(string identifier, CommandsConfiguration configuration) : base(identifier, configuration) { }
     public override RunResult Run()
     {
         Console.Clear();

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/CommandTemplate.cs

@@ -1,11 +1,6 @@
 namespace PainKiller.PowerCommands.Core.Commands;
 
-public class CommandTemplate : CommandBase<CommandsConfiguration>
+public class CommandTemplate(string identifier, CommandsConfiguration configuration) : CommandBase<CommandsConfiguration>(identifier, configuration)
 {
-    public CommandTemplate(string identifier, CommandsConfiguration configuration) : base(identifier, configuration) { }
-
-    public override RunResult Run()
-    {
-        return Ok();
-    }
+    public override RunResult Run() => Ok();
 }

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/CommandsCommand.cs

@@ -6,10 +6,8 @@
                          options: "this|reserved|default|!update|add-proxy",
               disableProxyOutput: true,
                          example: "//Show all commands|commands|//Show your custom commands|commands --this|//Show reserved commands|commands --reserved|//Search for commands matching \"encrypt\"|commands \"encrypt\"|//Show default command|commands --default|//Update the dir command (command must exist in the configured PowerCommands project)|commands --update dir|//Add a proxy|commands --add-proxy")]
-public class CommandsCommand : CommandBase<CommandsConfiguration>
+public class CommandsCommand(string identifier, CommandsConfiguration configuration) : CommandBase<CommandsConfiguration>(identifier, configuration)
 {
-    public CommandsCommand(string identifier, CommandsConfiguration configuration) : base(identifier, configuration) { }
-
     public override RunResult Run()
     {
         Input.DoBadOptionCheck(this);

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/DescribeCommand.cs

@@ -6,10 +6,8 @@
                          options: "docs|clear",
               disableProxyOutput: true,
                          example: "describe exit|describe cls|describe log|//Open documentation about options (if any)|describe options --doc")]
-public class DescribeCommand : CommandBase<CommandsConfiguration>
+public class DescribeCommand(string identifier, CommandsConfiguration configuration) : CommandBase<CommandsConfiguration>(identifier, configuration)
 {
-    public DescribeCommand(string identifier, CommandsConfiguration configuration) : base(identifier, configuration) { }
-
     public override RunResult Run()
     {
         if(Input.HasOption("docs")) ShowDoc();
@@ -43,8 +41,8 @@ public void ShowDoc()
 
     private void ShowCommand()
     {
-        var identifier = string.IsNullOrEmpty(Input.SingleArgument) ? "describe" : Input.SingleArgument;
-        var command = IPowerCommandsRuntime.DefaultInstance?.Commands.FirstOrDefault(c => c.Identifier == identifier);
+        var commandIdentifier = string.IsNullOrEmpty(Input.SingleArgument) ? "describe" : Input.SingleArgument;
+        var command = IPowerCommandsRuntime.DefaultInstance?.Commands.FirstOrDefault(c => c.Identifier == commandIdentifier);
         if (command == null)
         {
             if (Input.Identifier != nameof(DescribeCommand).ToLower().Replace("command", "")) WriteLine($"Command with identifier:{Input.Identifier} not found");

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/DirCommand.cs

@@ -3,10 +3,8 @@
 [PowerCommandDesign(description: "List the content of the working directory or this applications app directory, with the option to open the directory with the File explorer ",
     options: "open|app",
     example: "//List the content and open the current working directory|dir --open|//Open the AppData roaming directory|dir --app --open")]
-public class DirCommand : CommandBase<CommandsConfiguration>
+public class DirCommand(string identifier, CommandsConfiguration configuration) : CommandBase<CommandsConfiguration>(identifier, configuration)
 {
-    public DirCommand(string identifier, CommandsConfiguration configuration) : base(identifier, configuration) { }
-
     public override RunResult Run()
     {
         var directory = Input.HasOption("app") ? ConfigurationGlobals.ApplicationDataFolder : CdCommand.WorkingDirectory;

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/ExitCommand.cs

@@ -5,9 +5,8 @@
                       suggestions: "y",
               disableProxyOutput: true,
                          example: "exit|exit y|exit Yes")]
-public class ExitCommand : CommandBase<CommandsConfiguration>
+public class ExitCommand(string identifier, CommandsConfiguration configuration) : CommandBase<CommandsConfiguration>(identifier, configuration)
 {
-    public ExitCommand(string identifier, CommandsConfiguration configuration) : base(identifier, configuration) { }
     public override RunResult Run()
     {
         if (Input.Arguments.Length > 0 && Input.Arguments.First().ToLower().StartsWith("y")) return new RunResult(this, Input, output: "exit program", RunResultStatus.Quit);

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/LogCommand.cs

@@ -6,10 +6,8 @@
                      suggestions: "view|archive",
                disableProxyOutput: true,
                           example: "//View a list with all the logfiles|log|//Archive the logs into a zip file.|log archive|//View content of the current log|log view|//Filter the log show only posts matching the provided process tag, this requires that you are using process tags when logging in your command(s).|log --process created")]
-public class LogCommand : CommandBase<CommandsConfiguration>
+public class LogCommand(string identifier, CommandsConfiguration configuration) : CommandBase<CommandsConfiguration>(identifier, configuration)
 {
-    public LogCommand(string identifier, CommandsConfiguration configuration) : base(identifier, configuration) { }
-
     public override RunResult Run()
     {
         if (Input.Options.Length == 0) List();

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/PowerCommandCommand.cs

@@ -7,10 +7,10 @@
                            quotes: "<path>",
                disableProxyOutput: true,
                           example: "//create new VS solution|powercommand new --solution testproject --output \"C:\\Temp\\\"|//Create new PowerCommand named Demo|powercommand new --command Demo|//Update powercommands core, this will first delete current Core projects and than apply the new Core projects|powercommand update|//Only update template(s)|powercommand update --templates|//Update with backup|powercommand update --backup|//Create a new command|powercommand new --command MyNewCommand")]
-public class PowerCommandCommand : CommandBase<CommandsConfiguration>
+public class PowerCommandCommand(string identifier, CommandsConfiguration configuration) : CommandBase<CommandsConfiguration>(identifier, configuration)
 {
     private readonly ArtifactPathsConfiguration _artifact = ConfigurationService.Service.Get<ArtifactPathsConfiguration>().Configuration;
-    public PowerCommandCommand(string identifier, CommandsConfiguration configuration) : base(identifier, configuration) { }
+
     public override RunResult Run()
     {
         var name = Input.HasOption("solution") ? Input.GetOptionValue("solution") : Input.GetOptionValue("template");

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/ProxyCommando.cs

@@ -4,27 +4,16 @@
                               options: "retry-interval-seconds|no-quit",
                               example: "//Use the retry-interval-seconds option to decide how long pause it should be between retries|//\nUse the --no-quit option to tell the proxy application to not quit after the command is run.",
                    disableProxyOutput: true)]
-public class ProxyCommando : CommandBase<CommandsConfiguration>
+public class ProxyCommando(string identifier, CommandsConfiguration configuration, string name, string workingDirectory, string aliasName)
+    : CommandBase<CommandsConfiguration>(string.IsNullOrEmpty(aliasName) ? identifier : aliasName, configuration)
 {
-    private readonly string _name;
-    private readonly string _workingDirctory;
-    private readonly string _aliasName;
-    private readonly string _identifier;
-
-    public ProxyCommando(string identifier, CommandsConfiguration configuration, string name, string workingDirectory, string aliasName) : base(string.IsNullOrEmpty(aliasName) ? identifier : aliasName, configuration)
-    {
-        _identifier = identifier;
-        _name = name;
-        _workingDirctory = workingDirectory;
-        _aliasName = aliasName;
-    }
     public override RunResult Run()
     {
         WriteProcessLog("Proxy", $"{Input.Raw}");
-        var input = (Identifier == _identifier) ? Input.Raw.Interpret(Configuration.DefaultCommand) : Input.Raw.Replace(_aliasName, _identifier).Interpret(Configuration.DefaultCommand);
+        var input = (Identifier == identifier) ? Input.Raw.Interpret(Configuration.DefaultCommand) : Input.Raw.Replace(aliasName, identifier).Interpret(Configuration.DefaultCommand);
         var start = DateTime.Now;
         var quitOption = Input.HasOption("no-quit") ? "" : " --justRunOnceThenQuitPowerCommand";
-        ShellService.Service.Execute(_name, $"{input.Raw}{quitOption}", _workingDirctory, WriteLine, useShellExecute: true);
+        ShellService.Service.Execute(name, $"{input.Raw}{quitOption}", workingDirectory, WriteLine, useShellExecute: true);
 
         var retries = 0;
         var maxRetries = 10;
@@ -48,5 +37,5 @@ public override RunResult Run()
         }
         return Ok();
     }
-    private string GetOutputFilename() => Path.Combine(ConfigurationGlobals.ApplicationDataFolder, $"proxy_{_identifier}.data");
+    private string GetOutputFilename() => Path.Combine(ConfigurationGlobals.ApplicationDataFolder, $"proxy_{identifier}.data");
 }

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/SecretCommand.cs

@@ -6,9 +6,8 @@ namespace PainKiller.PowerCommands.Core.Commands;
     options: "create|initialize|configuration|remove|salt",
     disableProxyOutput: true,
     example: "//View all declared secrets|secret|secret --create \"mycommand-pass\"|secret --remove \"mycommand-pass\"|//Initialize your machine with a new encryption key (stops if this is already done)|secret --initialize")]
-public class SecretCommand : CommandBase<CommandsConfiguration>
+public class SecretCommand(string identifier, CommandsConfiguration configuration) : CommandBase<CommandsConfiguration>(identifier, configuration)
 {
-    public SecretCommand(string identifier, CommandsConfiguration configuration) : base(identifier, configuration) { }
     public override RunResult Run()
     {
         if (Input.HasOption("initialize")) return Init();

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/TestCommand.cs

@@ -4,10 +4,8 @@
                            options: "all|!command|trace",
                 disableProxyOutput: true,
                            example: "//Test a specific command|test --command commandName|//Test all commands (default) option could be omitted|test --all")]
-public class TestCommand : CommandBase<CommandsConfiguration>
+public class TestCommand(string identifier, CommandsConfiguration configuration) : CommandBase<CommandsConfiguration>(identifier, configuration)
 {
-    public TestCommand(string identifier, CommandsConfiguration configuration) : base(identifier, configuration) { }
-
     public override RunResult Run()
     {
         Console.Clear();

src/PainKiller.PowerCommands/Core/PainKiller.PowerCommands.Core/Commands/VersionCommand.cs

@@ -5,10 +5,8 @@ namespace PainKiller.PowerCommands.Core.Commands;
 [PowerCommandTest(tests: " ")]
 [PowerCommandDesign(description:"Shows current version for the Core components.",
              disableProxyOutput: true)]
-public class VersionCommand : CommandBase<CommandsConfiguration>
+public class VersionCommand(string identifier, CommandsConfiguration configuration) : CommandBase<CommandsConfiguration>(identifier, configuration)
 {
-    public VersionCommand(string identifier, CommandsConfiguration configuration) : base(identifier, configuration) { }
-
     public override RunResult Run()
     {
         WriteLine($" {nameof(Core)}: {ReflectionService.Service.GetVersion(Assembly.Load($"PainKiller.PowerCommands.Core"))}");