Merge pull request #5 from MORYX-Industry/cleanup/general-codestyle

seveneleven · web-flow · commit 27bb9655899f · 2024-01-09T15:12:26.000+01:00
Cleaned general code style
diff --git a/Moryx.Cli.sln.DotSettings b/Moryx.Cli.sln.DotSettings
@@ -0,0 +1,2 @@
+﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Moryx/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/src/Moryx.Cli.Commands/AddModule.cs b/src/Moryx.Cli.Commands/AddModule.cs
@@ -8,7 +8,7 @@ public static class AddModule
     {
         public static CommandResult Exec(TemplateSettings settings, string moduleName)
         {
-            return CommandBase.Exec(settings, (filenames) =>
+            return CommandBase.Exec(settings, (fileNames) =>
                 AddThing.Exec(
                 settings,
                 new AddConfig
@@ -18,7 +18,7 @@ public static CommandResult Exec(TemplateSettings settings, string moduleName)
                     Thing = "module",
                     ThingPlaceholder = Template.Template.ModulePlaceholder,
                 },
-                filenames.Module(),
+                fileNames.Module(),
                 s => AddProjectsToSolution(settings, s)
                 ));            
         }
diff --git a/src/Moryx.Cli.Commands/AddProducts.cs b/src/Moryx.Cli.Commands/AddProducts.cs
@@ -9,23 +9,20 @@ public class AddProducts
     {
         public static CommandResult Exec(TemplateSettings settings, IEnumerable<string> products)
         {
-            return CommandBase.Exec(settings, (filenames) =>
-            {
-                return Add(settings, filenames, products);
-            });
+            return CommandBase.Exec(settings, (fileNames) => Add(settings, fileNames, products));
         }
 
         private static CommandResult Add(TemplateSettings settings, List<string> cleanedResourceNames, IEnumerable<string> products)
         {
-            var projectFilenames = cleanedResourceNames.InitialProjects();
+            var projectFileNames = cleanedResourceNames.InitialProjects();
             var filteredResourceNames = cleanedResourceNames.Product();
 
             var msg = new List<string>();
             foreach (var product in products)
             {
                 try
                 {
-                    var dictionary = Template.Template.PrepareFileStructure(settings.AppName, filteredResourceNames, projectFilenames);
+                    var dictionary = Template.Template.PrepareFileStructure(settings.AppName, filteredResourceNames, projectFileNames);
 
                     var files = Template.Template.WriteFilesToDisk(
                         dictionary,
diff --git a/src/Moryx.Cli.Commands/AddStep.cs b/src/Moryx.Cli.Commands/AddStep.cs
@@ -7,7 +7,7 @@ public static class AddStep
     {
         public static CommandResult Exec(TemplateSettings settings, string step)
         {
-            return CommandBase.Exec(settings, (filenames)
+            return CommandBase.Exec(settings, (fileNames)
                 => AddThing.Exec(
                     settings,
                     new AddConfig
@@ -17,7 +17,7 @@ public static CommandResult Exec(TemplateSettings settings, string step)
                         Thing = "step",
                         ThingPlaceholder = Template.Template.StepPlaceholder,
                     },
-                    filenames.Step()
+                    fileNames.Step()
                     ));
         }
     }
diff --git a/src/Moryx.Cli.Commands/AddSteps.cs b/src/Moryx.Cli.Commands/AddSteps.cs
@@ -8,7 +8,7 @@ public static class AddSteps
     {
         public static CommandResult Exec(TemplateSettings settings, IEnumerable<string> cells)
         {
-            return CommandBase.Exec(settings, (filenames) 
+            return CommandBase.Exec(settings, (fileNames) 
                 => cells.Select(step => AddThing.Exec(
                     settings,
                     new AddConfig
@@ -18,7 +18,7 @@ public static CommandResult Exec(TemplateSettings settings, IEnumerable<string>
                         Thing = "step",
                         ThingPlaceholder = Template.Template.StepPlaceholder,
                     },
-                    filenames.Step()
+                    fileNames.Step()
                     ))
                     .ToArray()
                     .Flatten());
diff --git a/src/Moryx.Cli.Commands/AddThing.cs b/src/Moryx.Cli.Commands/AddThing.cs
@@ -7,13 +7,13 @@ public static class AddThing
     {
         public static CommandResult Exec(TemplateSettings settings, AddConfig config, List<string> resourceNames, Action<IEnumerable<string>>? onAddedFiles = null)
         {
-            return CommandBase.Exec(settings, (filenames) =>
+            return CommandBase.Exec(settings, (fileNames) =>
             {
-                var projectFilenames = filenames.InitialProjects();
+                var projectFileNames = fileNames.InitialProjects();
 
                 try
                 {
-                    var dictionary = Template.Template.PrepareFileStructure(config.SolutionName, resourceNames, projectFilenames);
+                    var dictionary = Template.Template.PrepareFileStructure(config.SolutionName, resourceNames, projectFileNames);
 
                     var files = Template.Template.WriteFilesToDisk(
                         dictionary,
diff --git a/src/Moryx.Cli.Commands/CreateNew.cs b/src/Moryx.Cli.Commands/CreateNew.cs
@@ -2,14 +2,13 @@
 using Moryx.Cli.Template.Extensions;
 using Moryx.Cli.Template;
 using Moryx.Cli.Template.Models;
-using System.Diagnostics.CodeAnalysis;
 using Moryx.Cli.Commands.Extensions;
 
 namespace Moryx.Cli.Commands
 {
     public static class CreateNew
     {
-        public static CommandResult Solution(NewOptions options, [NotNull] Action<string> onStatus)
+        public static CommandResult Solution(NewOptions options, Action<string> onStatus)
         {
             var solutionName = options.Name!;
             if (Directory.Exists(solutionName))
@@ -21,7 +20,7 @@ public static CommandResult Solution(NewOptions options, [NotNull] Action<string
             var settings = config.AsTemplateSettings(dir, solutionName);
             settings.Pull = options.Pull;
 
-            return CommandBase.Exec(settings, (filenames) =>
+            return CommandBase.Exec(settings, _ =>
             {
                 Directory.CreateDirectory(solutionName);
                 CreateBareSolution(settings);
@@ -74,12 +73,12 @@ private static void InitializeGitRepo(string solutionName, Action<string> onStat
         {
             var initialDirectory = Environment.CurrentDirectory;
             Directory.SetCurrentDirectory(Path.Combine(Environment.CurrentDirectory, solutionName));
-            var result = TemplateRepository.ExecCommanLine("git init", onStatus);
+            var result = TemplateRepository.ExecCommandLine("git init", onStatus);
             if (result == 0)
             {
-                TemplateRepository.ExecCommanLine("git checkout -b main", onStatus);
-                TemplateRepository.ExecCommanLine("git add --all", onStatus);
-                TemplateRepository.ExecCommanLine($"git commit -am \"Initial commit for {solutionName}\"", onStatus);
+                TemplateRepository.ExecCommandLine("git checkout -b main", onStatus);
+                TemplateRepository.ExecCommandLine("git add --all", onStatus);
+                TemplateRepository.ExecCommandLine($"git commit -am \"Initial commit for {solutionName}\"", onStatus);
                 onStatus("Initialized Git repository");
             }
             else
diff --git a/src/Moryx.Cli.Commands/ExecCommand.cs b/src/Moryx.Cli.Commands/ExecCommand.cs
@@ -1,4 +1,5 @@
-﻿using Moryx.Cli.Commands.Options;
+﻿using System.Net;
+using Moryx.Cli.Commands.Options;
 using System.Net.Http.Json;
 
 namespace Moryx.Cli.Commands
@@ -51,6 +52,7 @@ internal static CommandResult PostSetup(ExecOptions options)
     internal class ModuleResponse
     {
         public string? Name { get; set; }
+
         public string? HealthState { get; set; }
     }
 }
diff --git a/src/Moryx.Cli.Commands/Extensions/CommandResultExtensions.cs b/src/Moryx.Cli.Commands/Extensions/CommandResultExtensions.cs
@@ -2,7 +2,8 @@
 {
     internal static class CommandResultExtensions
     {
-        internal static CommandResult Flatten(this CommandResult[] results) {
+        internal static CommandResult Flatten(this CommandResult[] results)
+        {
             if (results.Any(r => r.Error != null))
             {
                 return CommandResult.WithError(string.Join("\n", results.Select(r => r.Error)));
diff --git a/src/Moryx.Cli.Template/Models/TemplateSettings.cs b/src/Moryx.Cli.Template/Models/TemplateSettings.cs
@@ -3,13 +3,18 @@
     public class TemplateSettings
     {
         public string Branch { get; set; }
+
         public string Repository { get; set; }
+
         public bool Pull { get; set; }
+
         public string AppName { get; set; }
+
         public string ProfileName { get; set; } = "default";
+
         public string TargetDirectory { get; set; }
-        public string SourceDirectory { get => Path.Combine(TemplatesRoot(), ProfileName, Branch); }
 
+        public string SourceDirectory { get => Path.Combine(TemplatesRoot(), ProfileName, Branch); }
 
         public string TemplatesRoot()
            => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Moryx.Cli");
diff --git a/src/Moryx.Cli.Template/Template.cs b/src/Moryx.Cli.Template/Template.cs
@@ -1,6 +1,4 @@
 ﻿using Moryx.Cli.Template.Models;
-using System.Diagnostics.CodeAnalysis;
-
 
 namespace Moryx.Cli.Template
 {
@@ -103,11 +101,10 @@ public static List<ProjectFileInfo> InitialProjects(this List<string> list)
         {
             return list
                 .Where(s => s.EndsWith(".csproj"))
-                .Select(s => ExtractProjectInfo(s))
-                .Where(s => s != null)
+                .Select(ExtractProjectInfo)
                 .Select(f => new ProjectFileInfo
                 {
-                    Name = f!.Name,
+                    Name = f.Name,
                     Filename = f.Filename,
                     Extension = f.Extension,
                 })
@@ -147,7 +144,7 @@ public static List<string> CellSelector(this List<string> list)
         }
 
         private static ProjectFileInfo ExtractProjectInfo(string str)
-            => new ProjectFileInfo
+            => new()
             {
                 Name = Path.GetFileNameWithoutExtension(str),
                 Filename = str,
@@ -175,16 +172,16 @@ private static async Task ReplaceInFile(string file, Dictionary<string, string>
             await File.WriteAllTextAsync(file, text);
         }
 
-        public static Dictionary<ProjectFileInfo, List<string>> PrepareFileStructure(string solution, List<string> cleanedResourceNames, List<ProjectFileInfo> projectFilenames)
+        public static Dictionary<ProjectFileInfo, List<string>> PrepareFileStructure(string solution, List<string> cleanedResourceNames, List<ProjectFileInfo> projectFileNames)
         {
             var dictionary = new Dictionary<ProjectFileInfo, List<string>>();
 
             // Reverse list to avoid problems with similar project names
             // e.g. Moryx.App vs Moryx.App.Plus
-            var reverseFilenames = projectFilenames
+            var reverseFileNames = projectFileNames
                 .OrderByDescending(x => x.Name)
                 .ToList();
-            foreach (var project in reverseFilenames)
+            foreach (var project in reverseFileNames)
             {
                 var projectRelatedFiles = cleanedResourceNames
                     .Where(f => f.Contains(project.Name) && !f.EndsWith(".sln"))
@@ -204,7 +201,6 @@ public static IEnumerable<string> WriteFilesToDisk(Dictionary<ProjectFileInfo, L
             foreach (var pair in dictionary.SelectMany(pair => pair.Value))
             {
                 var newFilename = customReplace(pair.Replace(settings.SourceDirectory, settings.TargetDirectory)).Replace(AppPlaceholder, settings.AppName);
-                var path = Path.Combine(settings.TargetDirectory, pair);
 
                 Directory.CreateDirectory(newFilename.Replace(Path.GetFileName(newFilename), ""));
                 File.Copy(pair, newFilename, true);
@@ -223,29 +219,27 @@ public static string ReplaceStepName(this string str, string stepName)
         public static string GetSolutionName(string dir, Action<string> onError)
         {
             var files = Directory.GetFiles(dir, "*.sln");
-            if (files != null)
+            switch (files.Length)
             {
-                if (files.Length == 1)
-                {
+                case 1:
                     return Path.GetFileNameWithoutExtension(files[0]);
-                }
-                if (files.Length > 1)
-                {
+                case > 1:
                     onError("Too many `.sln` found. Please make sure, there is only one solution.");
                     return "";
-                }
+                default:
+                    onError("No `.sln` found. Please make sure, there is a VisualStudio solution in this directory.");
+                    return "";
             }
-            onError("No `.sln` found. Please make sure, there is a VisualStudio solution in this directory.");
-            return "";
         }
     }
 
     public class ProjectFileInfo
     {
         public string Name { get; set; }
+
         public string Filename { get; set; }
-        public string Extension { get; set; }
 
+        public string Extension { get; set; }
 
         public override bool Equals(object? obj)
         {
@@ -269,7 +263,7 @@ public bool Equals(string? x, string? y)
             return y.Contains(x);
         }
 
-        public int GetHashCode([DisallowNull] string obj)
+        public int GetHashCode(string obj)
         {
             return 0;
         }
diff --git a/src/Moryx.Cli.Template/TemplateRepository.cs b/src/Moryx.Cli.Template/TemplateRepository.cs
@@ -11,15 +11,15 @@ public static void Clone(TemplateSettings settings)
 
             if (!Directory.Exists(targetDir))
             {
-                ExecCommanLine($"git clone {settings.Repository} -b {settings.Branch} --depth 1 --single-branch {targetDir}", _ => { });
+                ExecCommandLine($"git clone {settings.Repository} -b {settings.Branch} --depth 1 --single-branch {targetDir}", _ => { });
             }
             else if(settings.Pull)
             {
-                ExecCommanLine($"git -C {targetDir} pull", _ => { });
+                ExecCommandLine($"git -C {targetDir} pull", _ => { });
             }
         }
 
-        public static int ExecCommanLine(string command, Action<string> onStatus)
+        public static int ExecCommandLine(string command, Action<string> onStatus)
         {
             var process = new Process
             {
diff --git a/src/Moryx.Cli/CommandLine/Exec.cs b/src/Moryx.Cli/CommandLine/Exec.cs
@@ -9,7 +9,6 @@ namespace Moryx.Cli.CommandLine
     [Description("Executes a command against a running MORYX instance.")]
     internal class Exec : Command<Exec.Settings>
     {
-
         internal class Settings : CommandSettings
         {
             [Description("Command to be executed agains a running MORYX instance")]
diff --git a/src/Moryx.Cli/CommandLine/New.cs b/src/Moryx.Cli/CommandLine/New.cs
@@ -10,7 +10,6 @@ namespace Moryx.Cli.CommandLine
     [Description("Creates a new MORYX application project <NAME>.")]
     internal class New : Command<New.Settings>
     {
-
         internal class Settings : CommandSettings
         {
             [Description("Name of the project. Recommended to be PascalCase.")]
diff --git a/src/Moryx.Cli/Moryx.Cli.csproj b/src/Moryx.Cli/Moryx.Cli.csproj
@@ -12,7 +12,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="Spectre.Console" Version="0.47.0" />
     <PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
   </ItemGroup>
diff --git a/src/Moryx.Cli/Program.cs b/src/Moryx.Cli/Program.cs
@@ -1,22 +1,14 @@
-﻿using CommandLine;
-using Moryx.Cli.CommandLine;
+﻿using Moryx.Cli.CommandLine;
 using Spectre.Console.Cli;
 
 namespace Moryx.Cli
 {
     internal class Program
     {
-
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
-            var app = new CommandApp()
-                .Setup();
+            var app = new CommandApp().Setup();
             app.Run(args);
-            //Parser.Default.ParseArguments<NewOptions, AddOptions, ExecOptions>(args)
-            //    .WithParsed<NewOptions>(CreateNew.Solution)
-            //    .WithParsed<AddOptions>(Add.Exec)
-            //    .WithParsed<ExecOptions>(ExecCommand.Exec)
-            //    .WithNotParsed(errors => { });
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">`
	`2`	`+ <s:Boolean x:Key="/Default/UserDictionary/Words/=Moryx/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public static class AddModule`
`8`	`8`	`{`
`9`	`9`	`public static CommandResult Exec(TemplateSettings settings, string moduleName)`
`10`	`10`	`{`
`11`		`- return CommandBase.Exec(settings, (filenames) =>`
	`11`	`+ return CommandBase.Exec(settings, (fileNames) =>`
`12`	`12`	`AddThing.Exec(`
`13`	`13`	`settings,`
`14`	`14`	`new AddConfig`
`@@ -18,7 +18,7 @@ public static CommandResult Exec(TemplateSettings settings, string moduleName)`
`18`	`18`	`Thing = "module",`
`19`	`19`	`ThingPlaceholder = Template.Template.ModulePlaceholder,`
`20`	`20`	`},`
`21`		`- filenames.Module(),`
	`21`	`+ fileNames.Module(),`
`22`	`22`	`s => AddProjectsToSolution(settings, s)`
`23`	`23`	`));`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,23 +9,20 @@ public class AddProducts`
`9`	`9`	`{`
`10`	`10`	`public static CommandResult Exec(TemplateSettings settings, IEnumerable<string> products)`
`11`	`11`	`{`
`12`		`- return CommandBase.Exec(settings, (filenames) =>`
`13`		`- {`
`14`		`- return Add(settings, filenames, products);`
`15`		`- });`
	`12`	`+ return CommandBase.Exec(settings, (fileNames) => Add(settings, fileNames, products));`
`16`	`13`	`}`
`17`	`14`
`18`	`15`	`private static CommandResult Add(TemplateSettings settings, List<string> cleanedResourceNames, IEnumerable<string> products)`
`19`	`16`	`{`
`20`		`- var projectFilenames = cleanedResourceNames.InitialProjects();`
	`17`	`+ var projectFileNames = cleanedResourceNames.InitialProjects();`
`21`	`18`	`var filteredResourceNames = cleanedResourceNames.Product();`
`22`	`19`
`23`	`20`	`var msg = new List<string>();`
`24`	`21`	`foreach (var product in products)`
`25`	`22`	`{`
`26`	`23`	`try`
`27`	`24`	`{`
`28`		`- var dictionary = Template.Template.PrepareFileStructure(settings.AppName, filteredResourceNames, projectFilenames);`
	`25`	`+ var dictionary = Template.Template.PrepareFileStructure(settings.AppName, filteredResourceNames, projectFileNames);`
`29`	`26`
`30`	`27`	`var files = Template.Template.WriteFilesToDisk(`
`31`	`28`	`dictionary,`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public static class AddStep`
`7`	`7`	`{`
`8`	`8`	`public static CommandResult Exec(TemplateSettings settings, string step)`
`9`	`9`	`{`
`10`		`- return CommandBase.Exec(settings, (filenames)`
	`10`	`+ return CommandBase.Exec(settings, (fileNames)`
`11`	`11`	`=> AddThing.Exec(`
`12`	`12`	`settings,`
`13`	`13`	`new AddConfig`
`@@ -17,7 +17,7 @@ public static CommandResult Exec(TemplateSettings settings, string step)`
`17`	`17`	`Thing = "step",`
`18`	`18`	`ThingPlaceholder = Template.Template.StepPlaceholder,`
`19`	`19`	`},`
`20`		`- filenames.Step()`
	`20`	`+ fileNames.Step()`
`21`	`21`	`));`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@ public static class AddThing`
`7`	`7`	`{`
`8`	`8`	`public static CommandResult Exec(TemplateSettings settings, AddConfig config, List<string> resourceNames, Action<IEnumerable<string>>? onAddedFiles = null)`
`9`	`9`	`{`
`10`		`- return CommandBase.Exec(settings, (filenames) =>`
	`10`	`+ return CommandBase.Exec(settings, (fileNames) =>`
`11`	`11`	`{`
`12`		`- var projectFilenames = filenames.InitialProjects();`
	`12`	`+ var projectFileNames = fileNames.InitialProjects();`
`13`	`13`
`14`	`14`	`try`
`15`	`15`	`{`
`16`		`- var dictionary = Template.Template.PrepareFileStructure(config.SolutionName, resourceNames, projectFilenames);`
	`16`	`+ var dictionary = Template.Template.PrepareFileStructure(config.SolutionName, resourceNames, projectFileNames);`
`17`	`17`
`18`	`18`	`var files = Template.Template.WriteFilesToDisk(`
`19`	`19`	`dictionary,`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,13 @@`
`2`	`2`	`using Moryx.Cli.Template.Extensions;`
`3`	`3`	`using Moryx.Cli.Template;`
`4`	`4`	`using Moryx.Cli.Template.Models;`
`5`		`-using System.Diagnostics.CodeAnalysis;`
`6`	`5`	`using Moryx.Cli.Commands.Extensions;`
`7`	`6`
`8`	`7`	`namespace Moryx.Cli.Commands`
`9`	`8`	`{`
`10`	`9`	`public static class CreateNew`
`11`	`10`	`{`
`12`		`- public static CommandResult Solution(NewOptions options, [NotNull] Action<string> onStatus)`
	`11`	`+ public static CommandResult Solution(NewOptions options, Action<string> onStatus)`
`13`	`12`	`{`
`14`	`13`	`var solutionName = options.Name!;`
`15`	`14`	`if (Directory.Exists(solutionName))`
`@@ -21,7 +20,7 @@ public static CommandResult Solution(NewOptions options, [NotNull] Action<string`
`21`	`20`	`var settings = config.AsTemplateSettings(dir, solutionName);`
`22`	`21`	`settings.Pull = options.Pull;`
`23`	`22`
`24`		`- return CommandBase.Exec(settings, (filenames) =>`
	`23`	`+ return CommandBase.Exec(settings, _ =>`
`25`	`24`	`{`
`26`	`25`	`Directory.CreateDirectory(solutionName);`
`27`	`26`	`CreateBareSolution(settings);`
`@@ -74,12 +73,12 @@ private static void InitializeGitRepo(string solutionName, Action<string> onStat`
`74`	`73`	`{`
`75`	`74`	`var initialDirectory = Environment.CurrentDirectory;`
`76`	`75`	`Directory.SetCurrentDirectory(Path.Combine(Environment.CurrentDirectory, solutionName));`
`77`		`- var result = TemplateRepository.ExecCommanLine("git init", onStatus);`
	`76`	`+ var result = TemplateRepository.ExecCommandLine("git init", onStatus);`
`78`	`77`	`if (result == 0)`
`79`	`78`	`{`
`80`		`- TemplateRepository.ExecCommanLine("git checkout -b main", onStatus);`
`81`		`- TemplateRepository.ExecCommanLine("git add --all", onStatus);`
`82`		`- TemplateRepository.ExecCommanLine($"git commit -am \"Initial commit for {solutionName}\"", onStatus);`
	`79`	`+ TemplateRepository.ExecCommandLine("git checkout -b main", onStatus);`
	`80`	`+ TemplateRepository.ExecCommandLine("git add --all", onStatus);`
	`81`	`+ TemplateRepository.ExecCommandLine($"git commit -am \"Initial commit for {solutionName}\"", onStatus);`
`83`	`82`	`onStatus("Initialized Git repository");`
`84`	`83`	`}`
`85`	`84`	`else`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using Moryx.Cli.Commands.Options;`
	`1`	`+using System.Net;`
	`2`	`+using Moryx.Cli.Commands.Options;`
`2`	`3`	`using System.Net.Http.Json;`
`3`	`4`
`4`	`5`	`namespace Moryx.Cli.Commands`
`@@ -51,6 +52,7 @@ internal static CommandResult PostSetup(ExecOptions options)`
`51`	`52`	`internal class ModuleResponse`
`52`	`53`	`{`
`53`	`54`	`public string? Name { get; set; }`
	`55`	`+`
`54`	`56`	`public string? HealthState { get; set; }`
`55`	`57`	`}`
`56`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@`
`2`	`2`	`{`
`3`	`3`	`internal static class CommandResultExtensions`
`4`	`4`	`{`
`5`		`- internal static CommandResult Flatten(this CommandResult[] results) {`
	`5`	`+ internal static CommandResult Flatten(this CommandResult[] results)`
	`6`	`+ {`
`6`	`7`	`if (results.Any(r => r.Error != null))`
`7`	`8`	`{`
`8`	`9`	`return CommandResult.WithError(string.Join("\n", results.Select(r => r.Error)));`