fix CI (slnx vs sln) (#1002)

* add dummy change

* try fix

* replace .NET infor with dotnet --info in CI

* better fix

* Add null check for SDK before version comparison

* Remove empty lines in CHANGELOG.md

* Fix condition to check SDK version for solution format

* Fix logical operator in NewSolutionCommandBuilder

Author: gasparnagy

.github/workflows/ci.yml

@@ -443,8 +443,7 @@ jobs:
         dotnet-version: ${{ env.DOTNET_VERSIONS }}
     - name: .NET Information
       run: |
-        dotnet --list-sdks
-        dotnet --list-runtimes
+        dotnet --info
     - name: System Tests
       shell: pwsh
       run: dotnet test ./Tests/Reqnroll.SystemTests/bin/${{ needs.build.outputs.product_configuration }}/*/Reqnroll.SystemTests.dll --logger "trx;LogFileName=${{ github.workspace }}/TestResults/systemtests-windows-results.trx" ${{ needs.build.outputs.test_params }}
@@ -504,8 +503,7 @@ jobs:
         dotnet-version: ${{ env.DOTNET_VERSIONS }}
     - name: .NET Information
       run: |
-        dotnet --list-sdks
-        dotnet --list-runtimes
+        dotnet --info
     - name: System Tests
       shell: pwsh
       run: dotnet test ./Tests/Reqnroll.SystemTests/bin/${{ needs.build.outputs.product_configuration }}/*/Reqnroll.SystemTests.dll --filter "TestCategory!=MsBuild&TestCategory!=NetFramework" --logger "trx;LogFileName=${{ github.workspace }}/TestResults/systemtests-linux-results.trx" ${{ needs.build.outputs.test_params }}

Tests/TestProjectGenerator/Reqnroll.TestProjectGenerator/Dotnet/NewCommandBuilder.NewSolutionCommandBuilder.cs

@@ -1,43 +1,40 @@
-namespace Reqnroll.TestProjectGenerator.Dotnet
-{
-    public partial class NewCommandBuilder
-    {
-        public class NewSolutionCommandBuilder : BaseCommandBuilder
-        {
-            protected string _name;
-            protected string _rootPath;
-
-            public NewSolutionCommandBuilder InFolder(string rootPath)
-            {
-                _rootPath = rootPath;
-                return this;
-            }
+using Reqnroll.TestProjectGenerator.FilesystemWriter;
 
-            public NewSolutionCommandBuilder WithName(string name)
-            {
-                _name = name;
-                return this;
-            }
+namespace Reqnroll.TestProjectGenerator.Dotnet;
 
-            protected override string GetWorkingDirectory()
-            {
-                return _rootPath;
-            }
+public partial class NewCommandBuilder
+{
+    public class NewSolutionCommandBuilder(IOutputWriter outputWriter, DotNetSdkInfo sdk) : BaseCommandBuilder(outputWriter)
+    {
+        protected string _name;
+        protected string _rootPath;
+        protected DotNetSdkInfo _sdk = sdk;
 
-            protected override string BuildArguments()
-            {
-                string arguments = $"new sln";
-                arguments = AddArgument(arguments, "-n", _name);
-                arguments = AddArgument(arguments, "-o", "\"" + _rootPath + "\"");
+        public NewSolutionCommandBuilder InFolder(string rootPath)
+        {
+            _rootPath = rootPath;
+            return this;
+        }
 
-                return arguments;
-            }
+        public NewSolutionCommandBuilder WithName(string name)
+        {
+            _name = name;
+            return this;
+        }
 
+        protected override string GetWorkingDirectory()
+        {
+            return _rootPath;
+        }
 
-            public NewSolutionCommandBuilder(IOutputWriter outputWriter) : base(outputWriter)
-            {
-            }
+        protected override string BuildArguments()
+        {
+            string arguments = "new sln";
+            arguments = AddArgument(arguments, "-n", _name);
+            arguments = AddArgument(arguments, "-o", "\"" + _rootPath + "\"");
+            if (_sdk == null || _sdk.GetParsedVersion().Major >= 10)
+                arguments = AddArgument(arguments, "-f", "sln"); // force sln format (the default has changed to slnx)
+            return arguments;
         }
     }
-
 }

Tests/TestProjectGenerator/Reqnroll.TestProjectGenerator/Dotnet/NewCommandBuilder.StubNewSolutionCommandBuilder.cs

@@ -4,7 +4,7 @@ namespace Reqnroll.TestProjectGenerator.Dotnet;
 
 public partial class NewCommandBuilder
 {
-    public class StubNewSolutionCommandBuilder(IOutputWriter outputWriter, DotNetSdkInfo _sdk) : NewSolutionCommandBuilder(outputWriter)
+    public class StubNewSolutionCommandBuilder(IOutputWriter outputWriter, DotNetSdkInfo sdk) : NewSolutionCommandBuilder(outputWriter, sdk)
     {
         public override CommandBuilder Build()
         {

Tests/TestProjectGenerator/Reqnroll.TestProjectGenerator/FilesystemWriter/DotNetSdkInfo.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Reqnroll.TestProjectGenerator.FilesystemWriter
 {
     public class DotNetSdkInfo
@@ -8,5 +10,10 @@ internal DotNetSdkInfo(string version)
         }
 
         public string Version { get; }
+
+        public Version GetParsedVersion()
+        {
+            return Version != null ? new Version(Version) : throw new InvalidOperationException("Version is null");
+        }
     }
 }