use poly guard

SimonCropp · SimonCropp · commit 0f8715fad5df · 2024-10-06T10:55:04.000+11:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -15,5 +15,6 @@
     <NuGetAuditLevel>low</NuGetAuditLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <PolyGuard>true</PolyGuard>
   </PropertyGroup>
 </Project>
diff --git a/src/SetStartupProjects/Guard.cs b/src/SetStartupProjects/Guard.cs
diff --git a/src/SetStartupProjects/SolutionProjectExtractor.cs b/src/SetStartupProjects/SolutionProjectExtractor.cs
@@ -7,7 +7,7 @@ public static class SolutionProjectExtractor
 {
     public static IEnumerable<Project> GetAllProjectFiles(string solutionFile)
     {
-        Guard.AgainstNullAndEmpty(solutionFile, nameof(solutionFile));
+        Guard.FileExists(solutionFile, nameof(solutionFile));
         var solutionDirectory = Path.GetDirectoryName(solutionFile)!;
         foreach (var line in File.ReadAllLines(solutionFile))
         {
diff --git a/src/SetStartupProjects/StartProjectFinder.cs b/src/SetStartupProjects/StartProjectFinder.cs
@@ -49,8 +49,7 @@ where ShouldIncludeProjectFile(project)
     /// </summary>
     public static IEnumerable<string> GetStartProjects(string solutionFile)
     {
-        Guard.AgainstNullAndEmpty(solutionFile, nameof(solutionFile));
-        Guard.AgainstNonExistingFile(solutionFile, nameof(solutionFile));
+        Guard.FileExists(solutionFile, nameof(solutionFile));
 
         var nameWithoutExtension = Path.GetFileNameWithoutExtension(solutionFile);
         var solutionDirectory = Path.GetDirectoryName(solutionFile)!;
@@ -84,7 +83,7 @@ public static IEnumerable<string> GetStartProjects(string solutionFile)
     static bool ShouldIncludeProjectFile(Project project)
     {
         var projectFile = project.FullPath;
-        Guard.AgainstNonExistingFile(projectFile, "Project");
+        Guard.FileExists(projectFile, "Project");
         try
         {
             if (ShouldIncludeForFileExtension(Path.GetExtension(projectFile)))
diff --git a/src/SetStartupProjects/StartProjectSuoCreator.cs b/src/SetStartupProjects/StartProjectSuoCreator.cs
@@ -13,8 +13,8 @@ public static class StartProjectSuoCreator
     /// </remarks>
     public static void CreateForSolutionFile(string solutionFilePath, List<string> startupProjectGuids, VisualStudioVersions visualStudioVersions = VisualStudioVersions.All)
     {
-        Guard.AgainstNullAndEmpty(solutionFilePath, nameof(solutionFilePath));
-        Guard.AgainstNonExistingFile(solutionFilePath, nameof(solutionFilePath));
+        Guard.NotNullOrWhiteSpace(solutionFilePath, nameof(solutionFilePath));
+        Guard.FileExists(solutionFilePath, nameof(solutionFilePath));
         if (startupProjectGuids.Count == 0)
         {
             throw new ArgumentOutOfRangeException(nameof(startupProjectGuids), $"For solutionFilePath: '{solutionFilePath}'");

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public static class SolutionProjectExtractor`
`7`	`7`	`{`
`8`	`8`	`public static IEnumerable<Project> GetAllProjectFiles(string solutionFile)`
`9`	`9`	`{`
`10`		`- Guard.AgainstNullAndEmpty(solutionFile, nameof(solutionFile));`
	`10`	`+ Guard.FileExists(solutionFile, nameof(solutionFile));`
`11`	`11`	`var solutionDirectory = Path.GetDirectoryName(solutionFile)!;`
`12`	`12`	`foreach (var line in File.ReadAllLines(solutionFile))`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ where ShouldIncludeProjectFile(project)`
`49`	`49`	`/// </summary>`
`50`	`50`	`public static IEnumerable<string> GetStartProjects(string solutionFile)`
`51`	`51`	`{`
`52`		`- Guard.AgainstNullAndEmpty(solutionFile, nameof(solutionFile));`
`53`		`- Guard.AgainstNonExistingFile(solutionFile, nameof(solutionFile));`
	`52`	`+ Guard.FileExists(solutionFile, nameof(solutionFile));`
`54`	`53`
`55`	`54`	`var nameWithoutExtension = Path.GetFileNameWithoutExtension(solutionFile);`
`56`	`55`	`var solutionDirectory = Path.GetDirectoryName(solutionFile)!;`
`@@ -84,7 +83,7 @@ public static IEnumerable<string> GetStartProjects(string solutionFile)`
`84`	`83`	`static bool ShouldIncludeProjectFile(Project project)`
`85`	`84`	`{`
`86`	`85`	`var projectFile = project.FullPath;`
`87`		`- Guard.AgainstNonExistingFile(projectFile, "Project");`
	`86`	`+ Guard.FileExists(projectFile, "Project");`
`88`	`87`	`try`
`89`	`88`	`{`
`90`	`89`	`if (ShouldIncludeForFileExtension(Path.GetExtension(projectFile)))`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ public static class StartProjectSuoCreator`
`13`	`13`	`/// </remarks>`
`14`	`14`	`public static void CreateForSolutionFile(string solutionFilePath, List<string> startupProjectGuids, VisualStudioVersions visualStudioVersions = VisualStudioVersions.All)`
`15`	`15`	`{`
`16`		`- Guard.AgainstNullAndEmpty(solutionFilePath, nameof(solutionFilePath));`
`17`		`- Guard.AgainstNonExistingFile(solutionFilePath, nameof(solutionFilePath));`
	`16`	`+ Guard.NotNullOrWhiteSpace(solutionFilePath, nameof(solutionFilePath));`
	`17`	`+ Guard.FileExists(solutionFilePath, nameof(solutionFilePath));`
`18`	`18`	`if (startupProjectGuids.Count == 0)`
`19`	`19`	`{`
`20`	`20`	`throw new ArgumentOutOfRangeException(nameof(startupProjectGuids), $"For solutionFilePath: '{solutionFilePath}'");`