Merge remote-tracking branch 'github/main'

Author: seveneleven

Build.ps1

@@ -1,7 +1,8 @@
 param (
     [switch]$Build,
     [switch]$Licensing,
-    [switch]$Pack
+    [switch]$Pack,
+    [switch]$Publish
 )
 
 # Load Toolkit
@@ -25,4 +26,8 @@ if ($Pack) {
     Invoke-PackAll -Symbols
 }
 
-Write-Host "Success!"
+if ($Publish) {
+    dotnet nuget push "artifacts/packages/" --api-key $MORYX_NUGET_APIKEY --source $MORYX_PACKAGE_TARGET --skip-duplicate --symbol-api-key $MORYX_NUGET_APIKEY --symbol-source $MORYX_PACKAGE_TARGET_V3
+}
+
+Write-Host "Success!"

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>

src/Moryx.Cli.Commands/CreateNew.cs

@@ -1,14 +1,13 @@
 using Moryx.Cli.Commands.Options;
 using Moryx.Cli.Templates.Extensions;
-using System.Diagnostics.CodeAnalysis;
 using Moryx.Cli.Commands.Extensions;
 using Moryx.Cli.Templates;
 
 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!;
             var dir = Path.Combine(Directory.GetCurrentDirectory(), solutionName);
@@ -86,12 +85,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

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;
 using System.Net.Http.Json;
 
@@ -55,6 +56,7 @@ internal static CommandResult PostSetup(ExecOptions options)
     internal class ModuleResponse
     {
         public string? Name { get; set; }
+
         public string? HealthState { get; set; }
     }
 }

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.Errors.Count > 0))
             {
                 return CommandResult.WithError(string.Join("\n", results.Select(r => string.Join("\n", r.Errors))));

src/Moryx.Cli.Templates/TemplateRepository.cs

@@ -16,16 +16,16 @@ public static int Clone(TemplateSettings settings, Action<string>? onStatus = nu
 
             if (!Directory.Exists(targetDir) || Directory.GetFiles(targetDir).Length == 0)
             {
-                return ExecCommanLine($"git clone {settings.Repository} -b {settings.Branch} --depth 1 --single-branch {targetDir}", _ => onStatus?.Invoke(_));
+                return ExecCommandLine($"git clone {settings.Repository} -b {settings.Branch} --depth 1 --single-branch {targetDir}", _ => onStatus?.Invoke(_));
             }
             else if (settings.Pull)
             {
-                return ExecCommanLine($"git -C {targetDir} pull", _ => onStatus?.Invoke(_));
+                return ExecCommandLine($"git -C {targetDir} pull", _ => onStatus?.Invoke(_));
             }
             return 0;
         }
 
-        public static int ExecCommanLine(string command, Action<string> onStatus)
+        public static int ExecCommandLine(string command, Action<string> onStatus)
         {
             var process = new Process
             {

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")]

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.")]

src/Moryx.Cli/Program.cs

@@ -5,11 +5,9 @@ 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);
         }
     }