Merge branch 'main' into 1.0.0

# Conflicts:
#	Src/CSharpier.Cli/CommandLineOptions.cs
#	Src/CSharpier.Cli/Program.cs
#	Src/CSharpier.Generators/NodePrinterGenerator.cs
#	Src/CSharpier.MsBuild/build/CSharpier.MsBuild.targets

Author: belav

.github/workflows/publish_nuget.yml

@@ -34,6 +34,7 @@ jobs:
       - name: Publish CSharpier dotnet tool on version change
         uses: alirezanet/[email protected]
         with:
+          PACKAGE_NAME: CSharpier
           PROJECT_FILE_PATH: Src/CSharpier.Cli/CSharpier.Cli.csproj
           TAG_FORMAT: "*"
       - name: Publish CSharpier.MsBuild library on version change

Src/CSharpier.Cli/CommandLineFormatter.cs

@@ -21,7 +21,7 @@ CancellationToken cancellationToken
     {
         try
         {
-            var stopwatch = Stopwatch.StartNew();
+            var timestamp = Stopwatch.GetTimestamp();
             var commandLineFormatterResult = new CommandLineFormatterResult();
 
             if (commandLineOptions.StandardInFileContents != null)
@@ -60,7 +60,8 @@ CancellationToken cancellationToken
                 {
                     var fileIssueLogger = new FileIssueLogger(
                         commandLineOptions.OriginalDirectoryOrFilePaths[0],
-                        logger
+                        logger,
+                        commandLineOptions.LogFormat
                     );
 
                     var printerOptions = await optionsProvider.GetPrinterOptionsForAsync(
@@ -101,7 +102,8 @@ await PerformFormattingSteps(
                 }
             }
 
-            commandLineFormatterResult.ElapsedMilliseconds = stopwatch.ElapsedMilliseconds;
+            commandLineFormatterResult.ElapsedMilliseconds = (long)
+                Stopwatch.GetElapsedTime(timestamp).TotalMilliseconds;
             if (!commandLineOptions.WriteStdout)
             {
                 logger.LogInformation(
@@ -236,7 +238,11 @@ await FormatPhysicalFile(
                 }
                 else if (warnForUnsupported)
                 {
-                    var fileIssueLogger = new FileIssueLogger(originalFilePath, logger);
+                    var fileIssueLogger = new FileIssueLogger(
+                        originalFilePath,
+                        logger,
+                        logFormat: LogFormat.Console
+                    );
                     fileIssueLogger.WriteWarning("Is an unsupported file type.");
                 }
             }
@@ -271,7 +277,7 @@ await FormatPhysicalFile(
                     .ToArray();
                 try
                 {
-                    Task.WaitAll(tasks, cancellationToken);
+                    await Task.WhenAll(tasks).WaitAsync(cancellationToken);
                 }
                 catch (OperationCanceledException ex)
                 {
@@ -307,7 +313,11 @@ CancellationToken cancellationToken
             cancellationToken
         );
 
-        var fileIssueLogger = new FileIssueLogger(originalFilePath, logger);
+        var fileIssueLogger = new FileIssueLogger(
+            originalFilePath,
+            logger,
+            commandLineOptions.LogFormat
+        );
 
         logger.LogDebug(
             commandLineOptions.Check

Src/CSharpier.Cli/CommandLineOptions.cs

@@ -8,6 +8,8 @@ internal class CommandLineOptions
     public string[] DirectoryOrFilePaths { get; init; } = [];
     public bool Check { get; init; }
     public bool SkipValidation { get; init; }
+    public LogFormat LogFormat { get; init; }
+    public bool Fast { get; init; }
     public bool SkipWrite { get; init; }
     public bool WriteStdout { get; init; }
     public bool NoCache { get; init; }

Src/CSharpier.Cli/ConsoleLogger.cs

@@ -2,7 +2,7 @@
 
 namespace CSharpier.Cli;
 
-internal class ConsoleLogger(IConsole console, LogLevel loggingLevel) : ILogger
+internal class ConsoleLogger(IConsole console, LogLevel loggingLevel, LogFormat logFormat) : ILogger
 {
     private static readonly object ConsoleLock = new();
 
@@ -52,7 +52,7 @@ void WriteLine(string? value = null)
         {
             var message = formatter(state, exception!);
 
-            if (logLevel >= LogLevel.Warning)
+            if (logFormat == LogFormat.Console && logLevel >= LogLevel.Warning)
             {
                 console.ForegroundColor = GetColorLevel(logLevel);
                 Write($"{logLevel} ");

Src/CSharpier.Cli/FileIssueLogger.cs

@@ -2,16 +2,26 @@
 
 namespace CSharpier.Cli;
 
-internal class FileIssueLogger(string filePath, ILogger logger)
+internal class FileIssueLogger(string filePath, ILogger logger, LogFormat logFormat)
 {
     public void WriteError(string value, Exception? exception = null)
     {
-        logger.LogError(exception, $"{this.GetPath()} - {value}");
+        logger.LogError(exception, GetMessageTemplate(), this.GetPath(), value);
     }
 
     public void WriteWarning(string value)
     {
-        logger.LogWarning($"{this.GetPath()} - {value}");
+        logger.LogWarning(GetMessageTemplate(), this.GetPath(), value);
+    }
+
+    private string GetMessageTemplate()
+    {
+        return logFormat switch
+        {
+            LogFormat.MsBuild => "{Path}: error: {Message}",
+            LogFormat.Console => "{Path} - {Message}",
+            _ => throw new NotImplementedException($"LogFormat: {Enum.GetName(logFormat)}"),
+        };
     }
 
     private string GetPath()

Src/CSharpier.Cli/FormattingCommands.cs

@@ -35,6 +35,7 @@ public static Command CreateFormatCommand()
         formatCommand.AddOption(writeStdoutOption);
         formatCommand.AddOption(CompilationErrorsAsWarningsOption);
         formatCommand.AddOption(ConfigPathOption);
+        formatCommand.AddOption(LogFormatOption);
         formatCommand.AddOption(LogLevelOption);
 
         formatCommand.SetHandler(async context =>
@@ -51,6 +52,7 @@ public static Command CreateFormatCommand()
             );
             var configPath = context.ParseResult.GetValueForOption(ConfigPathOption);
             var logLevel = context.ParseResult.GetValueForOption(LogLevelOption);
+            var logFormat = context.ParseResult.GetValueForOption(LogFormatOption);
             var token = context.GetCancellationToken();
 
             context.ExitCode = await FormatOrCheck(
@@ -65,6 +67,7 @@ public static Command CreateFormatCommand()
                 compilationErrorsAsWarnings,
                 configPath,
                 logLevel,
+                logFormat,
                 token
             );
         });
@@ -81,6 +84,7 @@ public static Command CreateCheckCommand()
         var directoryOrFileArgument = AddDirectoryOrFileArgument(checkCommand);
 
         checkCommand.AddOption(ConfigPathOption);
+        checkCommand.AddOption(LogFormatOption);
         checkCommand.AddOption(LogLevelOption);
         checkCommand.AddOption(IncludeGeneratedOption);
         checkCommand.AddOption(NoMsBuildCheckOption);
@@ -96,6 +100,7 @@ public static Command CreateCheckCommand()
             );
             var configPath = context.ParseResult.GetValueForOption(ConfigPathOption);
             var logLevel = context.ParseResult.GetValueForOption(LogLevelOption);
+            var logFormat = context.ParseResult.GetValueForOption(LogFormatOption);
             var token = context.GetCancellationToken();
 
             context.ExitCode = await FormatOrCheck(
@@ -110,6 +115,7 @@ public static Command CreateCheckCommand()
                 compilationErrorsAsWarnings,
                 configPath,
                 logLevel,
+                logFormat,
                 token
             );
         });
@@ -129,11 +135,12 @@ private static async Task<int> FormatOrCheck(
         bool compilationErrorsAsWarnings,
         string? configPath,
         LogLevel logLevel,
+        LogFormat logFormat,
         CancellationToken cancellationToken
     )
     {
         var console = new SystemConsole();
-        var logger = new ConsoleLogger(console, logLevel);
+        var logger = new ConsoleLogger(console, logLevel, logFormat);
 
         var directoryOrFileNotProvided = directoryOrFile is null or { Length: 0 };
         var originalDirectoryOrFile = directoryOrFile;
@@ -210,8 +217,18 @@ private static Argument<string[]> AddDirectoryOrFileArgument(Command command)
         "Path to the CSharpier configuration file"
     );
 
+    private static readonly Option<LogFormat> LogFormatOption = new(
+        ["--log-format"],
+        () => LogFormat.Console,
+        """
+        Log output format
+          Console (default) - Formats messages in a human readable way for console interaction.
+          MsBuild - Formats messages in standard error/warning format for MSBuild.
+        """
+    );
+
     private static readonly Option<LogLevel> LogLevelOption = new(
-        ["--loglevel"],
+        ["--log-level"],
         () => LogLevel.Information,
         "Specify the log level - Debug, Information (default), Warning, Error, None"
     );

Src/CSharpier.Cli/LogFormat.cs

@@ -0,0 +1,14 @@
+namespace CSharpier.Cli;
+
+internal enum LogFormat
+{
+    /// <summary>
+    /// Formats messages in a human readable way for console interaction.
+    /// </summary>
+    Console,
+
+    /// <summary>
+    /// Formats messages in standard error/warning format for MSBuild.
+    /// </summary>
+    MsBuild,
+}

Src/CSharpier.Cli/PipeCommand.cs

@@ -25,7 +25,7 @@ public static Command Create()
             var logLevel = LogLevel.Information;
 
             var console = new SystemConsole();
-            var logger = new ConsoleLogger(console, logLevel);
+            var logger = new ConsoleLogger(console, logLevel, LogFormat.Console);
 
             var cancellationToken = context.GetCancellationToken();
             context.ExitCode = await PipeMultipleFilesFormatter.StartServer(

Src/CSharpier.Cli/ServerCommand.cs

@@ -25,7 +25,7 @@ public static Command Create()
             var serverPort = context.ParseResult.GetValueForOption(serverPortOption);
             context.ExitCode = await ServerFormatter.StartServer(
                 serverPort,
-                new ConsoleLogger(new SystemConsole(), logLevel)
+                new ConsoleLogger(new SystemConsole(), logLevel, LogFormat.Console)
             );
         });