Add MSBuildProjectDirectory fallback to ProjectDir resolution (#5146)

Author: lahma

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>14.3.0</VersionPrefix>
+    <VersionPrefix>14.3.1</VersionPrefix>
 
     <Authors>Rico Suter</Authors>
     <Copyright>Copyright © Rico Suter, 2023</Copyright>

src/NSwag.Commands/Commands/Generation/AspNetCore/ProjectMetadata.cs

@@ -83,7 +83,11 @@ public static async Task<ProjectMetadata> GetProjectMetadata(
 
             var args = CreateMsBuildArguments(file, framework, configuration, runtime, noBuild, outputPath);
 
-            var metadata = await TryReadingUsingGetProperties(args, file, noBuild) ?? await ReadUsingMsBuildTargets(args, file, buildExtensionsDir, console);
+            var metadata = await TryReadingUsingGetProperties(args, file, noBuild);
+            if (metadata == null || string.IsNullOrWhiteSpace(metadata[nameof(ProjectDir)]))
+            {
+                metadata = await ReadUsingMsBuildTargets(args, file, buildExtensionsDir, console);
+            }
 
             var platformTarget = metadata[nameof(PlatformTarget)];
             if (platformTarget.Length == 0)
@@ -225,7 +229,8 @@ private static async Task<Dictionary<string, string>> TryReadingUsingGetProperti
                 nameof(ProjectDir),
                 nameof(ProjectRuntimeConfigFilePath),
                 nameof(TargetFileName),
-                nameof(TargetFrameworkIdentifier)
+                nameof(TargetFrameworkIdentifier),
+                "MSBuildProjectDirectory",
             };
 
             try
@@ -251,6 +256,12 @@ private static async Task<Dictionary<string, string>> TryReadingUsingGetProperti
                         .EnumerateObject()
                         .ToDictionary(x => x.Name, x => x.Value.ToString().Trim());
 
+                    // depending on the project type or MSBuild evaluation process, the ProjectDir property may not be set
+                    if (string.IsNullOrWhiteSpace(metadata[nameof(ProjectDir)]))
+                    {
+                        metadata[nameof(ProjectDir)] = metadata["MSBuildProjectDirectory"];
+                    }
+
                     return metadata;
                 }
             }