Update to SlnEditor v4

For the simplified interface
timabell · Dec 22, 2023 · ea8d16b · ea8d16b
1 parent 9722ee9
commit ea8d16b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/src/CLI.cs b/src/CLI.cs
@@ -1,15 +1,13 @@
 using CommandLine;
-using SlnEditor;
-using SlnEditor.Contracts;
-using SlnEditor.Helper;
+using SlnEditor.Mappings;
+using SlnEditor.Models;
 
 namespace sln_items_sync;
 
 public class CLI(IGuidGenerator? guidGenerator = null)
 {
 	private readonly IGuidGenerator _guidGenerator = guidGenerator ?? new DefaultGuidGenerator();
-	private static SolutionParser _parser = new();
-	private static Guid _solutionFolderTypeGuid = new ProjectTypeMapper().ToGuid(ProjectType.SolutionFolder);
+	private static readonly Guid SolutionFolderTypeGuid = new ProjectTypeMap().Guids[ProjectType.SolutionFolder];
 
 	public class Options
 	{
@@ -51,11 +49,10 @@ public void SyncSlnFile(string slnPath, string slnFolder, IEnumerable<string> pa
 		File.WriteAllText(slnPath, updatedSln);
 	}
 
-	// todo: allow mocking filesystem calls
 	// todo: move to sensible files
 	public string SyncSlnText(string contents, string slnFolder, IEnumerable<string> paths)
 	{
-		var solution = _parser.ParseText(contents);
+		var solution = new Solution(contents);
 
 		var solutionItems = FindOrCreateSolutionFolder(solution.Projects, slnFolder, slnFolder);
 
@@ -76,8 +73,7 @@ public string SyncSlnText(string contents, string slnFolder, IEnumerable<string>
 		}
 
 
-		var updatedSln = solution.Write();
-		return updatedSln;
+		return solution.ToString();
 	}
 
 	private static void SyncFile(SolutionFolder solutionItems, string path)
@@ -120,7 +116,7 @@ private SolutionFolder FindOrCreateSolutionFolder(ICollection<IProject> solution
 		}
 
 		solutionItems = new SolutionFolder(id: _guidGenerator.Next(), name: solutionFolderName, path: path,
-			typeGuid: _solutionFolderTypeGuid, ProjectType.SolutionFolder);
+			typeGuid: SolutionFolderTypeGuid, ProjectType.SolutionFolder);
 		solutionProjects.Add(solutionItems);
 
 		return solutionItems;

diff --git a/src/sln-items-sync.csproj b/src/sln-items-sync.csproj
@@ -11,6 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="SlnEditor" Version="2.2.2" />
+    <PackageReference Include="SlnEditor" Version="4.0.0" />
   </ItemGroup>
 </Project>