Code cleanup

Author: NikolayPianikov

Build/Tools.cs

@@ -33,12 +33,9 @@ private static string GetNextRelease(SemanticVersion curVersion, string release)
             return release;
         }
 
-        if (int.TryParse(string.Concat(curVersion.Release.Where(char.IsNumber)), out var num))
-        {
-            return $"{string.Concat(curVersion.Release.Where(i => !char.IsNumber(i)))}{num + 1}";
-        }
-
-        return release;
+        return int.TryParse(string.Concat(curVersion.Release.Where(char.IsNumber)), out var num) 
+            ? $"{string.Concat(curVersion.Release.Where(i => !char.IsNumber(i)))}{num + 1}"
+            : release;
     }
 
     public static string GetProperty(string name, string defaultProp, bool showWarning = false)

CSharpInteractive.HostApi/Internal/HostComponents.cs

@@ -1,9 +1,9 @@
 // ReSharper disable ClassNeverInstantiated.Global
 namespace HostApi.Internal;
 
-using HostApi.Internal.Cmd;
-using HostApi.Internal.Docker;
-using HostApi.Internal.DotNet;
+using Cmd;
+using Docker;
+using DotNet;
 
 internal record HostComponents(
     // Settings

CSharpInteractive.Tests/AddNuGetReferenceCommandFactoryTests.cs

@@ -2,7 +2,6 @@ namespace CSharpInteractive.Tests;
 
 using System.Diagnostics.CodeAnalysis;
 using Core;
-using CSharpInteractive;
 using NuGet.Versioning;
 
 [SuppressMessage("Usage", "xUnit1042:The member referenced by the MemberData attribute returns untyped data rows")]

CSharpInteractive.Tests/AddNuGetReferenceCommandRunnerTests.cs

@@ -1,7 +1,6 @@
 namespace CSharpInteractive.Tests;
 
 using Core;
-using CSharpInteractive;
 using NuGet.Versioning;
 
 public class AddNuGetReferenceCommandRunnerTests
@@ -56,7 +55,7 @@ public void ShouldRegisterAssemblies()
     {
         // Given
         var runner = CreateInstance();
-        IReadOnlyCollection<ReferencingAssembly> assemblies = new []{_referencingAssembly1, _referencingAssembly2};
+        IReadOnlyCollection<ReferencingAssembly> assemblies = [_referencingAssembly1, _referencingAssembly2];
         _nuGetReferenceResolver.Setup(i => i.TryResolveAssemblies(_command.PackageId, _command.VersionRange, out assemblies)).Returns(true);
         var description = string.Empty;
         _referenceRegistry.Setup(i => i.TryRegisterAssembly(_referencingAssembly1.FilePath, out description)).Returns(true);
@@ -74,7 +73,7 @@ public void ShouldReturnFailWhenSomeAssemblyWasNotRegistered()
     {
         // Given
         var runner = CreateInstance();
-        IReadOnlyCollection<ReferencingAssembly> assemblies = new []{_referencingAssembly1, _referencingAssembly2};
+        IReadOnlyCollection<ReferencingAssembly> assemblies = [_referencingAssembly1, _referencingAssembly2];
         _nuGetReferenceResolver.Setup(i => i.TryResolveAssemblies(_command.PackageId, _command.VersionRange, out assemblies)).Returns(true);
         var description = string.Empty;
         _referenceRegistry.Setup(i => i.TryRegisterAssembly(_referencingAssembly1.FilePath, out description)).Returns(true);

CSharpInteractive.Tests/AssembliesScriptOptionsProviderTests.cs

@@ -4,7 +4,6 @@ namespace CSharpInteractive.Tests;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using Core;
-using CSharpInteractive;
 using Microsoft.CodeAnalysis.Scripting;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -20,7 +19,7 @@ public void ShouldAddReferencesForAssembliesWithLocation()
         var assembly1 = new Mock<Assembly>();
         var assembly2 = new Mock<Assembly>();
         assembly2.SetupGet(i => i.Location).Returns(Assembly.GetCallingAssembly().Location);
-        _assembliesProvider.Setup(i => i.GetAssemblies(It.IsAny<IEnumerable<Type>>())).Returns(new[] {assembly1.Object, assembly2.Object});
+        _assembliesProvider.Setup(i => i.GetAssemblies(It.IsAny<IEnumerable<Type>>())).Returns([assembly1.Object, assembly2.Object]);
         var provider = CreateInstance();
 
         // When

CSharpInteractive.Tests/BuildContextTests.cs

@@ -22,7 +22,7 @@ public void ShouldProcessStdOutput()
         var buildResult = result.Create(_commandLineResult.Object);
 
         // Then
-        messages.ShouldBe(new[] {msg});
+        messages.ShouldBe([msg]);
         buildResult.Errors.ShouldNotContain(msg);
     }
 
@@ -39,7 +39,7 @@ public void ShouldProcessErrOutput()
         var buildResult = result.Create(_commandLineResult.Object);
 
         // Then
-        messages.ShouldBe(new[] { msg });
+        messages.ShouldBe([msg]);
         buildResult.Errors.ShouldContain(msg);
     }
 
@@ -96,7 +96,7 @@ public void ShouldProcessTestFinished()
         test.State.ShouldBe(TestState.Finished);
         test.Message.ShouldBeEmpty();
         test.Details.ShouldBeEmpty();
-        test.Output.ShouldBe(new[] {stdOutput, errOutput});
+        test.Output.ShouldBe([stdOutput, errOutput]);
         test.ExecutorUri.ShouldBe(new Uri("executor://mstestadapter/v2", UriKind.RelativeOrAbsolute));
         test.LineNumber.ShouldBe(23);
     }
@@ -144,7 +144,7 @@ public void ShouldProcessTestFailed()
         test.State.ShouldBe(TestState.Failed);
         test.Message.ShouldBe("Some message");
         test.Details.ShouldBe("Error details");
-        test.Output.ShouldBe(new[] {new Output(_startInfo.Object, false, "Some output", 11)});
+        test.Output.ShouldBe([new Output(_startInfo.Object, false, "Some output", 11)]);
     }
 
     [Fact]
@@ -187,7 +187,7 @@ public void ShouldProcessTestIgnored()
         test.State.ShouldBe(TestState.Ignored);
         test.Message.ShouldBe("Some message");
         test.Details.ShouldBeEmpty();
-        test.Output.ShouldBe(new[] {new Output(_startInfo.Object, false, "Some output", 11)});
+        test.Output.ShouldBe([new Output(_startInfo.Object, false, "Some output", 11)]);
     }
 
     [Theory]
@@ -243,7 +243,7 @@ public void ShouldProcessMessage(string status, BuildMessageState state)
             DotNetMessageImportance.High);
 
         // When
-        result.ProcessMessage(output, message).ShouldBe(new[] {buildMessage});
+        result.ProcessMessage(output, message).ShouldBe([buildMessage]);
         var buildResult = result.Create(_commandLineResult.Object);
 
         // Then
@@ -258,13 +258,13 @@ public void ShouldProcessMessage(string status, BuildMessageState state)
                 break;
 
             case BuildMessageState.Warning:
-                buildResult.Warnings.ShouldBe(new[] {buildMessage});
+                buildResult.Warnings.ShouldBe([buildMessage]);
                 break;
 
             case BuildMessageState.Failure:
             case BuildMessageState.StdError:
             case BuildMessageState.BuildProblem:
-                buildResult.Errors.ShouldBe(new[] {buildMessage});
+                buildResult.Errors.ShouldBe([buildMessage]);
                 break;
         }
     }
@@ -309,12 +309,12 @@ public void ShouldBuildProblem()
             DotNetMessageImportance.High);
 
         // When
-        result.ProcessMessage(output, buildProblem).ShouldBe(new[] {buildMessage});
+        result.ProcessMessage(output, buildProblem).ShouldBe([buildMessage]);
         var buildResult = result.Create(_commandLineResult.Object);
 
         // Then
         buildResult.Tests.Count.ShouldBe(0);
-        buildResult.Errors.ShouldBe(new[] {buildMessage});
+        buildResult.Errors.ShouldBe([buildMessage]);
     }
 
     private static BuildContext CreateInstance() => new();

CSharpInteractive.Tests/BuildOutputProcessorTests.cs

@@ -21,9 +21,9 @@ public void ShouldConvertMessages()
         BuildMessage buildMsg1 = new(output, BuildMessageState.StdOut);
         BuildMessage buildMsg2 = new(output, BuildMessageState.StdOut);
         BuildMessage buildMsg3 = new(output, BuildMessageState.StdOut);
-        _serviceMessageParser.Setup(i => i.ParseServiceMessages("Messages")).Returns(new[] {msg1.Object, msg2.Object});
-        _buildResult.Setup(i => i.ProcessMessage(output, msg1.Object)).Returns(new[] {buildMsg1, buildMsg2});
-        _buildResult.Setup(i => i.ProcessMessage(output, msg2.Object)).Returns(new[] {buildMsg3});
+        _serviceMessageParser.Setup(i => i.ParseServiceMessages("Messages")).Returns([msg1.Object, msg2.Object]);
+        _buildResult.Setup(i => i.ProcessMessage(output, msg1.Object)).Returns([buildMsg1, buildMsg2]);
+        _buildResult.Setup(i => i.ProcessMessage(output, msg2.Object)).Returns([buildMsg3]);
         var processor = CreateInstance();
 
         // When
@@ -50,7 +50,7 @@ public void ShouldConvertWhenHasNoServiceMessages(bool isError)
         _serviceMessageParser.Setup(i => i.ParseServiceMessages("some output")).Returns([]);
         _buildResult.Setup(i => i.ProcessMessage(output, It.IsAny<IServiceMessage>())).Returns(Array.Empty<BuildMessage>());
         BuildMessage buildMsg = new(output, BuildMessageState.StdOut);
-        _buildResult.Setup(i => i.ProcessOutput(output)).Returns(new[] {buildMsg});
+        _buildResult.Setup(i => i.ProcessOutput(output)).Returns([buildMsg]);
         var processor = CreateInstance();
 
         // When

CSharpInteractive.Tests/BuildResultTests.cs

@@ -19,7 +19,7 @@ public class BuildResultTests
     public void ShouldSupportToString(int errors, int warnings, int failedTests, int ignoredTests, int passedTests, string expected)
     {
         // Given
-        var result = new BuildResult(_commandLineResult.Object) with
+        var result = new BuildResult(_commandLineResult.Object)
         {
             Errors = Enumerable.Repeat(new BuildMessage(Output, BuildMessageState.StdError), errors).ToArray(),
             Warnings = Enumerable.Repeat(new BuildMessage(Output, BuildMessageState.Warning), warnings).ToArray(),

CSharpInteractive.Tests/CISettingsTests.cs

@@ -2,7 +2,6 @@
 namespace CSharpInteractive.Tests;
 
 using Core;
-using CSharpInteractive;
 
 public class CISettingsTests
 {

CSharpInteractive.Tests/CISpecificTests.cs

@@ -2,7 +2,6 @@
 namespace CSharpInteractive.Tests;
 
 using Core;
-using CSharpInteractive;
 
 public class CISpecificTests
 {