From f7b61f98a1b60deeebdc972e16bdd35bb38ae385 Mon Sep 17 00:00:00 2001
From: Fredi Kats <fredikats@outlook.com>
Date: Tue, 23 Jan 2024 08:42:29 +0100
Subject: [PATCH 1/2] Add API for generating dotnet solution file template

---
 Sources/Directory.Packages.props              |  3 +-
 .../SolutionFileStringBuilderTests.cs         | 33 +++++++++++++++++
 .../GlobalUsings.cs                           |  4 +++
 .../Kysect.DotnetProjectSystem.Tests.csproj   | 12 ++++++-
 .../Generating/SolutionFileStringBuilder.cs   | 35 +++++++++++++++++++
 .../Kysect.DotnetProjectSystem.csproj         |  5 ---
 Sources/Kysect.DotnetProjectSystem/Program.cs |  2 --
 7 files changed, 85 insertions(+), 9 deletions(-)
 create mode 100644 Sources/Kysect.DotnetProjectSystem.Tests/Generating/SolutionFileStringBuilderTests.cs
 create mode 100644 Sources/Kysect.DotnetProjectSystem.Tests/GlobalUsings.cs
 create mode 100644 Sources/Kysect.DotnetProjectSystem/Generating/SolutionFileStringBuilder.cs
 delete mode 100644 Sources/Kysect.DotnetProjectSystem/Program.cs

diff --git a/Sources/Directory.Packages.props b/Sources/Directory.Packages.props
index a6f8267..6da6fd4 100644
--- a/Sources/Directory.Packages.props
+++ b/Sources/Directory.Packages.props
@@ -9,7 +9,7 @@
     <PackageVersion Include="Kysect.CommonLib" Version="0.1.13" />
     <PackageVersion Include="Kysect.CommonLib.DependencyInjection" Version="0.1.13" />
     <PackageVersion Include="Kysect.DotnetSlnGenerator" Version="0.1.6" />
-    <PackageVersion Include="Kysect.Editorconfig" Version="1.1.6" />
+    <PackageVersion Include="Kysect.Editorconfig" Version="1.1.7" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
@@ -36,5 +36,6 @@
     <PackageVersion Include="TestableIO.System.IO.Abstractions" Version="20.0.4" />
     <PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="20.0.4" />
     <PackageVersion Include="xunit" Version="2.6.6" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Sources/Kysect.DotnetProjectSystem.Tests/Generating/SolutionFileStringBuilderTests.cs b/Sources/Kysect.DotnetProjectSystem.Tests/Generating/SolutionFileStringBuilderTests.cs
new file mode 100644
index 0000000..bc4d03f
--- /dev/null
+++ b/Sources/Kysect.DotnetProjectSystem.Tests/Generating/SolutionFileStringBuilderTests.cs
@@ -0,0 +1,33 @@
+using Kysect.DotnetProjectSystem.Generating;
+
+namespace Kysect.DotnetProjectSystem.Tests.Generating;
+
+public class SolutionFileStringBuilderTests
+{
+    private readonly SolutionFileStringBuilder _sut;
+
+    public SolutionFileStringBuilderTests()
+    {
+        _sut = new SolutionFileStringBuilder();
+    }
+
+    [Fact]
+    public void Build_WithoutModification_ReturnTemplateString()
+    {
+        var expected = """
+                       Microsoft Visual Studio Solution File, Format Version 12.00
+                       # Visual Studio Version 17
+                       VisualStudioVersion = 17.9.34310.174
+                       MinimumVisualStudioVersion = 10.0.40219.1
+                       Global
+                         GlobalSection(SolutionProperties) = preSolution
+                           HideSolutionNode = FALSE
+                         EndGlobalSection
+                       EndGlobal
+                       """;
+
+        string actual = _sut.Build();
+
+        actual.Should().Be(expected);
+    }
+}
\ No newline at end of file
diff --git a/Sources/Kysect.DotnetProjectSystem.Tests/GlobalUsings.cs b/Sources/Kysect.DotnetProjectSystem.Tests/GlobalUsings.cs
new file mode 100644
index 0000000..fa742ab
--- /dev/null
+++ b/Sources/Kysect.DotnetProjectSystem.Tests/GlobalUsings.cs
@@ -0,0 +1,4 @@
+// Global using directives
+
+global using FluentAssertions;
+global using Xunit;
\ No newline at end of file
diff --git a/Sources/Kysect.DotnetProjectSystem.Tests/Kysect.DotnetProjectSystem.Tests.csproj b/Sources/Kysect.DotnetProjectSystem.Tests/Kysect.DotnetProjectSystem.Tests.csproj
index e8b6ab3..105cc0a 100644
--- a/Sources/Kysect.DotnetProjectSystem.Tests/Kysect.DotnetProjectSystem.Tests.csproj
+++ b/Sources/Kysect.DotnetProjectSystem.Tests/Kysect.DotnetProjectSystem.Tests.csproj
@@ -5,9 +5,11 @@
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
+    <NoWarn>$(NoWarn);CA1707</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <!-- <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
@@ -19,6 +21,14 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Kysect.DotnetProjectSystem\Kysect.DotnetProjectSystem.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Sources/Kysect.DotnetProjectSystem/Generating/SolutionFileStringBuilder.cs b/Sources/Kysect.DotnetProjectSystem/Generating/SolutionFileStringBuilder.cs
new file mode 100644
index 0000000..704df20
--- /dev/null
+++ b/Sources/Kysect.DotnetProjectSystem/Generating/SolutionFileStringBuilder.cs
@@ -0,0 +1,35 @@
+using System.Text;
+
+namespace Kysect.DotnetProjectSystem.Generating;
+
+public class SolutionFileStringBuilder
+{
+    private readonly StringBuilder _builder;
+
+    public SolutionFileStringBuilder()
+    {
+        const string header = """
+                              Microsoft Visual Studio Solution File, Format Version 12.00
+                              # Visual Studio Version 17
+                              VisualStudioVersion = 17.9.34310.174
+                              MinimumVisualStudioVersion = 10.0.40219.1
+                              """;
+
+        _builder = new StringBuilder();
+        _builder.AppendLine(header);
+    }
+
+    public string Build()
+    {
+        const string footer = """
+                              Global
+                                GlobalSection(SolutionProperties) = preSolution
+                                  HideSolutionNode = FALSE
+                                EndGlobalSection
+                              EndGlobal
+                              """;
+
+        _builder.Append(footer);
+        return _builder.ToString();
+    }
+}
\ No newline at end of file
diff --git a/Sources/Kysect.DotnetProjectSystem/Kysect.DotnetProjectSystem.csproj b/Sources/Kysect.DotnetProjectSystem/Kysect.DotnetProjectSystem.csproj
index 2150e37..9d5a3ce 100644
--- a/Sources/Kysect.DotnetProjectSystem/Kysect.DotnetProjectSystem.csproj
+++ b/Sources/Kysect.DotnetProjectSystem/Kysect.DotnetProjectSystem.csproj
@@ -1,10 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
-
 </Project>
diff --git a/Sources/Kysect.DotnetProjectSystem/Program.cs b/Sources/Kysect.DotnetProjectSystem/Program.cs
deleted file mode 100644
index 3751555..0000000
--- a/Sources/Kysect.DotnetProjectSystem/Program.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-// See https://aka.ms/new-console-template for more information
-Console.WriteLine("Hello, World!");

From ed5bf70dff8ff16db7e40470c5204a35ef2994bd Mon Sep 17 00:00:00 2001
From: Fredi Kats <fredikats@outlook.com>
Date: Tue, 23 Jan 2024 08:47:39 +0100
Subject: [PATCH 2/2] Add API for adding project while building sln file
 content

---
 .../SolutionFileStringBuilderTests.cs           | 17 +++++++++++++++--
 .../Generating/SolutionFileStringBuilder.cs     | 13 +++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/Sources/Kysect.DotnetProjectSystem.Tests/Generating/SolutionFileStringBuilderTests.cs b/Sources/Kysect.DotnetProjectSystem.Tests/Generating/SolutionFileStringBuilderTests.cs
index bc4d03f..cf8f862 100644
--- a/Sources/Kysect.DotnetProjectSystem.Tests/Generating/SolutionFileStringBuilderTests.cs
+++ b/Sources/Kysect.DotnetProjectSystem.Tests/Generating/SolutionFileStringBuilderTests.cs
@@ -26,8 +26,21 @@ public void Build_WithoutModification_ReturnTemplateString()
                        EndGlobal
                        """;
 
-        string actual = _sut.Build();
+        string slnFileContent = _sut.Build();
 
-        actual.Should().Be(expected);
+        slnFileContent.Should().Be(expected);
+    }
+
+    [Fact]
+    public void Build_AddProject_AddStringWithStringName()
+    {
+        string projectName = "Project";
+        string projectPath = @"Project\Project.csproj";
+
+        string slnFileContent = _sut
+            .AddProject(projectName, projectPath)
+            .Build();
+
+        slnFileContent.Should().Contain($"= \"{projectName}\", \"{projectPath}\",");
     }
 }
\ No newline at end of file
diff --git a/Sources/Kysect.DotnetProjectSystem/Generating/SolutionFileStringBuilder.cs b/Sources/Kysect.DotnetProjectSystem/Generating/SolutionFileStringBuilder.cs
index 704df20..c3b6379 100644
--- a/Sources/Kysect.DotnetProjectSystem/Generating/SolutionFileStringBuilder.cs
+++ b/Sources/Kysect.DotnetProjectSystem/Generating/SolutionFileStringBuilder.cs
@@ -32,4 +32,17 @@ public string Build()
         _builder.Append(footer);
         return _builder.ToString();
     }
+
+    public SolutionFileStringBuilder AddProject(string projectName, string projectPath)
+    {
+        // TODO: Support generating of unique GUID
+        string projectDefinition = $$"""
+                                     Project("{{{Guid.Empty}}}") = "{{projectName}}", "{{projectPath}}", "{{{Guid.Empty}}}"
+                                     EndProject
+                                     """;
+
+        _builder.AppendLine(projectDefinition);
+
+        return this;
+    }
 }
\ No newline at end of file