Skip to content

Add MSBuildProjectDirectory fallback to ProjectDir resolution #5146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 20, 2025
Merged

Add MSBuildProjectDirectory fallback to ProjectDir resolution #5146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
15 changes: 13 additions & 2 deletions src/NSwag.Commands/Commands/Generation/AspNetCore/ProjectMetadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -225,7 +229,8 @@ private static async Task<Dictionary<string, string>> TryReadingUsingGetProperti
nameof(ProjectDir),
nameof(ProjectRuntimeConfigFilePath),
nameof(TargetFileName),
nameof(TargetFrameworkIdentifier)
nameof(TargetFrameworkIdentifier),
"MSBuildProjectDirectory",
};

try
Expand All @@ -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;
}
}
Expand Down
Loading