[release/8.0] Use working directory as relative directory for project file resolution (#51974)

github-actions[bot] · captainsafia · web-flow · commit 068e593ca27c · 2023-11-13T16:21:27.000-08:00
* Use working directory as relative directory for project file resolution

* Address feedback and use primary constructors

---------

Co-authored-by: Safia Abdalla &lt;safia@safia.rocks&gt;
diff --git a/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs b/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs
@@ -109,7 +109,7 @@ private static (JwtCreatorOptions, bool, string) ValidateArguments(
         CommandOption claimsOption)
     {
         var isValid = true;
-        var finder = new MsBuildProjectFinder(projectOption.Value() ?? Directory.GetCurrentDirectory());
+        var finder = new MsBuildProjectFinder(Directory.GetCurrentDirectory());
         var project = finder.FindMsBuildProject(projectOption.Value());
 
         if (project == null)
diff --git a/src/Tools/dotnet-user-jwts/src/Helpers/DevJwtCliHelpers.cs b/src/Tools/dotnet-user-jwts/src/Helpers/DevJwtCliHelpers.cs
@@ -27,7 +27,7 @@ public static string GetOrSetUserSecretsId(string projectFilePath)
 
     public static bool GetProjectAndSecretsId(string projectPath, IReporter reporter, out string project, out string userSecretsId)
     {
-        var finder = new MsBuildProjectFinder(projectPath ?? Directory.GetCurrentDirectory());
+        var finder = new MsBuildProjectFinder(Directory.GetCurrentDirectory());
         project = finder.FindMsBuildProject(projectPath);
         userSecretsId = null;
         if (project == null)
diff --git a/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs b/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private static (JwtCreatorOptions, bool, string) ValidateArguments(`
`109`	`109`	`CommandOption claimsOption)`
`110`	`110`	`{`
`111`	`111`	`var isValid = true;`
`112`		`- var finder = new MsBuildProjectFinder(projectOption.Value() ?? Directory.GetCurrentDirectory());`
	`112`	`+ var finder = new MsBuildProjectFinder(Directory.GetCurrentDirectory());`
`113`	`113`	`var project = finder.FindMsBuildProject(projectOption.Value());`
`114`	`114`
`115`	`115`	`if (project == null)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public static string GetOrSetUserSecretsId(string projectFilePath)`
`27`	`27`
`28`	`28`	`public static bool GetProjectAndSecretsId(string projectPath, IReporter reporter, out string project, out string userSecretsId)`
`29`	`29`	`{`
`30`		`- var finder = new MsBuildProjectFinder(projectPath ?? Directory.GetCurrentDirectory());`
	`30`	`+ var finder = new MsBuildProjectFinder(Directory.GetCurrentDirectory());`
`31`	`31`	`project = finder.FindMsBuildProject(projectPath);`
`32`	`32`	`userSecretsId = null;`
`33`	`33`	`if (project == null)`