Bumping up to 0.26.0 (#990)

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.25.0",
+      "version": "0.26.0",
       "commands": [
         "dotnet-csharpier"
       ]

Src/CSharpier.Cli.Tests/CliTests.cs

@@ -131,7 +131,8 @@ public async Task Should_Return_Error_When_No_DirectoryOrFile_And_Not_Piping_Std
         var result = await new CsharpierProcess().ExecuteAsync();
 
         result.ExitCode.Should().Be(1);
-        result.ErrorOutput
+        result
+            .ErrorOutput
             .Should()
             .Contain("directoryOrFile is required when not piping stdin to CSharpier");
     }
@@ -170,7 +171,8 @@ public async Task Should_Print_NotFound()
         var result = await new CsharpierProcess().WithArguments("/BasicFile.cs").ExecuteAsync();
 
         result.Output.Should().BeEmpty();
-        result.ErrorOutput
+        result
+            .ErrorOutput
             .Should()
             .StartWith("There was no file or directory found at /BasicFile.cs");
         result.ExitCode.Should().Be(1);
@@ -199,7 +201,8 @@ public async Task With_Check_Should_Write_Unformatted_File()
             .WithArguments("CheckUnformatted.cs --check")
             .ExecuteAsync();
 
-        result.ErrorOutput
+        result
+            .ErrorOutput
             .Replace("\\", "/")
             .Should()
             .StartWith("Error ./CheckUnformatted.cs - Was not formatted.");
@@ -242,7 +245,8 @@ public async Task Should_Write_Error_With_Multiple_Piped_Files(string input, str
             .WithPipedInput($"{input}{'\u0003'}{invalidFile}{'\u0003'}")
             .ExecuteAsync();
 
-        result.ErrorOutput
+        result
+            .ErrorOutput
             .Should()
             .Be(
                 $"Error {output} - Failed to compile so was not formatted.{Environment.NewLine}  (1,26): error CS1513: }} expected{Environment.NewLine}"
@@ -341,7 +345,8 @@ await this.WriteFileAsync(
 
         var result = await new CsharpierProcess().WithArguments(".").ExecuteAsync();
 
-        result.ErrorOutput
+        result
+            .ErrorOutput
             .Should()
             .Contain("uses version 99 of CSharpier.MsBuild which is a mismatch with version");
         result.ExitCode.Should().Be(1);
@@ -504,7 +509,8 @@ public CsharpierProcess()
         {
             var path = Path.Combine(Directory.GetCurrentDirectory(), "dotnet-csharpier.dll");
 
-            this.command = CliWrap.Cli
+            this.command = CliWrap
+                .Cli
                 .Wrap("dotnet")
                 .WithArguments(path)
                 .WithWorkingDirectory(testFileDirectory)

Src/CSharpier.Cli/CommandLineFormatter.cs

@@ -1,7 +1,7 @@
-using System.Text;
-using CSharpier.Cli.Options;
 using System.Diagnostics;
 using System.IO.Abstractions;
+using System.Text;
+using CSharpier.Cli.Options;
 using CSharpier.Utilities;
 using Microsoft.Extensions.Logging;
 
@@ -153,9 +153,9 @@ CancellationToken cancellationToken
                 cancellationToken
             );
 
-            var originalDirectoryOrFile = commandLineOptions.OriginalDirectoryOrFilePaths[
-                x
-            ].Replace("\\", "/");
+            var originalDirectoryOrFile = commandLineOptions
+                .OriginalDirectoryOrFilePaths[x]
+                .Replace("\\", "/");
 
             var formattingCache = await FormattingCacheFactory.InitializeAsync(
                 commandLineOptions,
@@ -215,7 +215,8 @@ await FormatPhysicalFile(
                     return 1;
                 }
 
-                var tasks = fileSystem.Directory
+                var tasks = fileSystem
+                    .Directory
                     .EnumerateFiles(directoryOrFilePath, "*.cs", SearchOption.AllDirectories)
                     .Select(o =>
                     {

Src/CSharpier.Cli/EditorConfig/EditorConfigParser.cs

@@ -25,9 +25,9 @@ IFileSystem fileSystem
 
         while (directoryInfo is not null)
         {
-            var file = fileSystem.FileInfo.FromFileName(
-                fileSystem.Path.Combine(directoryInfo.FullName, ".editorconfig")
-            );
+            var file = fileSystem
+                .FileInfo
+                .FromFileName(fileSystem.Path.Combine(directoryInfo.FullName, ".editorconfig"));
             if (file.Exists)
             {
                 editorConfigFiles.Add(file);

Src/CSharpier.Cli/FormattingCache.cs

@@ -148,12 +148,14 @@ public async Task ResolveAsync(CancellationToken cancellationToken)
 
             async Task WriteFile()
             {
-                await using var fileStream = this.fileSystem.File.Open(
-                    this.cacheFile,
-                    FileMode.OpenOrCreate,
-                    FileAccess.ReadWrite,
-                    FileShare.None
-                );
+                await using var fileStream = this.fileSystem
+                    .File
+                    .Open(
+                        this.cacheFile,
+                        FileMode.OpenOrCreate,
+                        FileAccess.ReadWrite,
+                        FileShare.None
+                    );
                 await using var streamWriter = new StreamWriter(fileStream);
                 await streamWriter.WriteAsync(
                     JsonSerializer.Serialize(

Src/CSharpier.Cli/HasMismatchedCliAndMsBuildVersions.cs

@@ -9,13 +9,16 @@ public static class HasMismatchedCliAndMsBuildVersions
 {
     public static bool Check(string directoryName, IFileSystem fileSystem, ILogger logger)
     {
-        var csProjPaths = fileSystem.Directory
+        var csProjPaths = fileSystem
+            .Directory
             .EnumerateFiles(directoryName, "*.csproj", SearchOption.AllDirectories)
             .ToArray();
 
-        var versionOfDotnetTool = typeof(CommandLineFormatter).Assembly
+        var versionOfDotnetTool = typeof(CommandLineFormatter)
+            .Assembly
             .GetName()
-            .Version!.ToString(3);
+            .Version!
+            .ToString(3);
 
         string? GetPackagesVersion(string pathToCsProj)
         {

Src/CSharpier.Cli/IgnoreFile.cs

@@ -86,10 +86,9 @@ var line in await fileSystem.File.ReadAllLinesAsync(ignoreFilePath, cancellation
         var directoryInfo = fileSystem.DirectoryInfo.FromDirectoryName(baseDirectoryPath);
         while (directoryInfo != null)
         {
-            var ignoreFilePath = fileSystem.Path.Combine(
-                directoryInfo.FullName,
-                ".csharpierignore"
-            );
+            var ignoreFilePath = fileSystem
+                .Path
+                .Combine(directoryInfo.FullName, ".csharpierignore");
             if (fileSystem.File.Exists(ignoreFilePath))
             {
                 return ignoreFilePath;

Src/CSharpier.Cli/PhysicalFileInfoAndWriter.cs

@@ -15,11 +15,9 @@ public void WriteResult(CodeFormatterResult result, FileToFormatInfo fileToForma
     {
         if (result.Code != fileToFormatInfo.FileContents)
         {
-            this.FileSystem.File.WriteAllText(
-                fileToFormatInfo.Path,
-                result.Code,
-                fileToFormatInfo.Encoding
-            );
+            this.FileSystem
+                .File
+                .WriteAllText(fileToFormatInfo.Path, result.Code, fileToFormatInfo.Encoding);
         }
     }
 }

Src/CSharpier.FakeGenerators/ValidNodeTypes.cs

@@ -7,7 +7,8 @@ public static class ValidNodeTypes
 {
     public static IList<Type> Get()
     {
-        return typeof(CompilationUnitSyntax).Assembly
+        return typeof(CompilationUnitSyntax)
+            .Assembly
             .GetTypes()
             .Where(
                 o =>

Src/CSharpier.Generators/NodePrinterGenerator.cs

@@ -12,7 +12,9 @@ public class NodePrinterGenerator : TemplatedGenerator
 
     protected override object GetModel(GeneratorExecutionContext context)
     {
-        var nodeTypes = context.Compilation.SyntaxTrees
+        var nodeTypes = context
+            .Compilation
+            .SyntaxTrees
             .Where(o => o.FilePath.Contains("SyntaxNodePrinters"))
             .Select(o => Path.GetFileNameWithoutExtension(o.FilePath))
             .Select(

Src/CSharpier.MsBuild.Test/CSharpier.MsBuild.Test.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSharpier.MsBuild" Version="0.25.0">
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Src/CSharpier.Tests.Generators/FormattingTestsGenerator.cs

@@ -10,7 +10,8 @@ public class FormattingTestsGenerator : TemplatedGenerator
 
     protected override object GetModel(GeneratorExecutionContext context)
     {
-        var tests = context.AdditionalFiles
+        var tests = context
+            .AdditionalFiles
             .Where(
                 o =>
                     o.Path.EndsWith(".test")

Src/CSharpier.Tests/CommandLineFormatterTests.cs

@@ -1,8 +1,8 @@
+using System.IO.Abstractions.TestingHelpers;
 using System.Text;
 using CSharpier.Cli;
 using FluentAssertions;
 using NUnit.Framework;
-using System.IO.Abstractions.TestingHelpers;
 
 namespace CSharpier.Tests;
 
@@ -24,7 +24,8 @@ public void Format_Writes_Failed_To_Compile()
 
         var result = this.Format(context);
 
-        result.OutputLines
+        result
+            .OutputLines
             .First()
             .Should()
             .Be("Warning ./Invalid.cs - Failed to compile so was not formatted.");
@@ -38,7 +39,8 @@ public void Format_Writes_Failed_To_Compile_For_Subdirectory()
 
         var result = this.Format(context, directoryOrFilePaths: "Subdirectory");
 
-        result.OutputLines
+        result
+            .OutputLines
             .First()
             .Should()
             .Be("Warning ./Subdirectory/Invalid.cs - Failed to compile so was not formatted.");
@@ -55,7 +57,8 @@ public void Format_Writes_Failed_To_Compile_For_FullPath()
             directoryOrFilePaths: Path.Combine(context.GetRootPath(), "Subdirectory")
         );
 
-        result.OutputLines
+        result
+            .OutputLines
             .First()
             .Should()
             .Be(
@@ -71,7 +74,8 @@ public void Format_Writes_Failed_To_Compile_With_Directory()
 
         var result = this.Format(context);
 
-        result.OutputLines
+        result
+            .OutputLines
             .First()
             .Should()
             .Be("Warning ./Directory/Invalid.cs - Failed to compile so was not formatted.");
@@ -85,7 +89,8 @@ public void Format_Writes_Unsupported()
 
         var result = this.Format(context, directoryOrFilePaths: "Unsupported.js");
 
-        result.OutputLines
+        result
+            .OutputLines
             .First()
             .Should()
             .Be(@"Warning ./Unsupported.js - Is an unsupported file type.");
@@ -133,7 +138,8 @@ public void Works_With_MSBuild_Version_Checking(string version, bool shouldPass)
         else
         {
             result.ExitCode.Should().Be(1);
-            result.ErrorOutputLines
+            result
+                .ErrorOutputLines
                 .First()
                 .Should()
                 .EndWith(
@@ -161,7 +167,8 @@ public void Works_With_MSBuild_Version_Checking_When_No_Version_Specified()
         var result = this.Format(context);
 
         result.ExitCode.Should().Be(0);
-        result.OutputLines
+        result
+            .OutputLines
             .First()
             .Should()
             .EndWith($"Test.csproj uses an unknown version of CSharpier.MsBuild");
@@ -210,7 +217,8 @@ bool shouldPass
         else
         {
             result.ExitCode.Should().Be(1);
-            result.ErrorOutputLines
+            result
+                .ErrorOutputLines
                 .First()
                 .Should()
                 .EndWith(
@@ -275,7 +283,8 @@ public void Format_Checks_Unformatted_File()
 
         result.ExitCode.Should().Be(1);
         context.GetFileContent(unformattedFilePath).Should().Be(UnformattedClassContent);
-        result.ErrorOutputLines
+        result
+            .ErrorOutputLines
             .First()
             .Should()
             .StartWith("Error ./Unformatted.cs - Was not formatted.");
@@ -440,7 +449,8 @@ public void Ignore_Reports_Errors()
         var result = this.Format(context);
 
         result.ExitCode.Should().Be(1);
-        result.ErrorOutputLines
+        result
+            .ErrorOutputLines
             .First()
             .Replace("\\", "/")
             .Should()
@@ -500,7 +510,8 @@ public void File_With_Compilation_Error_Should_Not_Lose_Code()
         var result = this.Format(context);
 
         context.GetFileContent("Invalid.cs").Should().Be(contents);
-        result.OutputLines
+        result
+            .OutputLines
             .First()
             .Should()
             .Be("Warning ./Invalid.cs - Failed to compile so was not formatted.");
@@ -557,7 +568,8 @@ public void Empty_Config_Files_Should_Log_Warning(string configFileName)
 
         var result = this.Format(context);
 
-        result.OutputLines
+        result
+            .OutputLines
             .First()
             .Replace("\\", "/")
             .Should()

Src/CSharpier.Tests/DocPrinterTests.cs

@@ -756,7 +756,8 @@ private static string Print(
         bool useTabs = false
     )
     {
-        return DocPrinter.DocPrinter
+        return DocPrinter
+            .DocPrinter
             .Print(
                 doc,
                 new PrinterOptions

Src/CSharpier.Tests/DocUtilitiesTests.cs

@@ -92,7 +92,8 @@ public void RemoveInitialDoubleHardLine_Should_Remove_Single_HardLine()
 
         DocUtilities.RemoveInitialDoubleHardLine(doc);
 
-        concat.Contents
+        concat
+            .Contents
             .Should()
             .BeEquivalentTo(new List<Doc> { Doc.HardLine, Doc.Null, Doc.HardLine });
     }

Src/CSharpier.Tests/FormattingTests/LineEndingEdgeCase.cs

@@ -36,7 +36,8 @@ void MethodName()
             CancellationToken.None
         );
 
-        result.Code
+        result
+            .Code
             .Should()
             .Be(unformattedCode.ReplaceLineEndings(endOfLine == EndOfLine.LF ? "\n" : "\r\n"));
     }

Src/CSharpier.Tests/MissingTypeChecker.cs

@@ -28,7 +28,8 @@ public void Ensure_There_Are_No_Missing_Types()
             .Select(o => Path.GetFileNameWithoutExtension(o) + "Syntax")
             .ToList();
 
-        var syntaxNodeTypes = typeof(CompilationUnitSyntax).Assembly
+        var syntaxNodeTypes = typeof(CompilationUnitSyntax)
+            .Assembly
             .GetTypes()
             .Where(o => !o.IsAbstract && typeof(CSharpSyntaxNode).IsAssignableFrom(o))
             .ToList();