Skip to content

Support for .fsproj, .vbproj project files next to .csproj #12087

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 5 commits into from
Oct 21, 2025
Merged

Support for .fsproj, .vbproj project files next to .csproj #12087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8d2580
Restored support for .fsproj project files
yreynhout Oct 16, 2025
95f7843
Support csproj, fsproj and vbproj as extensions
yreynhout Oct 18, 2025
81c9c35
Removed the now obsolete check for fsproj only
yreynhout Oct 18, 2025
b4766d3
Fixing whitespace touching caused by the IDE
yreynhout Oct 18, 2025
bd15181
Refactor supported project file extensions handling
JamesNK Oct 21, 2025
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
6 changes: 4 additions & 2 deletions src/Aspire.Cli/Projects/ProjectLocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ internal interface IProjectLocator

internal sealed class ProjectLocator(ILogger<ProjectLocator> logger, IDotNetCliRunner runner, CliExecutionContext executionContext, IInteractionService interactionService, IConfigurationService configurationService, AspireCliTelemetry telemetry, IFeatures features) : IProjectLocator
{
private static readonly HashSet<string> s_supportedProjectFileExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".csproj", ".fsproj", ".vbproj" };
Copy link
Member

@mitchdenny mitchdenny Oct 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might need to introduce a FileExtensionHelper.IsSupportedMsBuildFile(...) which encapsulates the check. That way we can reuse it. There are a few other places in the CLI where we make assumptions about using *.csproj files.


public async Task<List<FileInfo>> FindAppHostProjectFilesAsync(string searchDirectory, CancellationToken cancellationToken)
{
var allCandidates = await FindAppHostProjectFilesAsync(new DirectoryInfo(searchDirectory), cancellationToken);
Expand Down Expand Up @@ -345,8 +347,8 @@ await Parallel.ForEachAsync(appHostFiles, parallelOptions, async (candidateFile,
throw new ProjectLocatorException(ErrorStrings.ProjectFileDoesntExist);
}
}
// Handle .csproj files
else if (projectFile.Extension.Equals(".csproj", StringComparison.OrdinalIgnoreCase))
// Handle .cs|fs|vbproj files
else if (s_supportedProjectFileExtensions.Contains(projectFile.Extension))
{
logger.LogDebug("Using project file {ProjectFile}", projectFile.FullName);
return projectFile;
Expand Down
10 changes: 7 additions & 3 deletions tests/Aspire.Cli.Tests/Projects/ProjectLocatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,15 @@ public async Task UseOrFindAppHostProjectFileThrowsIfNoProjectWasFound()
Assert.Equal("No project file found.", ex.Message);
}

[Fact]
public async Task UseOrFindAppHostProjectFileReturnsExplicitProjectIfExistsAndProvided()
[Theory]
[InlineData(".csproj")]
[InlineData(".fsproj")]
[InlineData(".vbproj")]
public async Task UseOrFindAppHostProjectFileReturnsExplicitProjectIfExistsAndProvided(string projectFileExtension)
{
var logger = NullLogger<ProjectLocator>.Instance;
using var workspace = TemporaryWorkspace.Create(outputHelper);
var projectFile = new FileInfo(Path.Combine(workspace.WorkspaceRoot.FullName, "AppHost.csproj"));
var projectFile = new FileInfo(Path.Combine(workspace.WorkspaceRoot.FullName, $"AppHost{projectFileExtension}"));
await File.WriteAllTextAsync(projectFile.FullName, "Not a real project file.");

var runner = new TestDotNetCliRunner();
Expand Down Expand Up @@ -1170,3 +1173,4 @@ public async Task FindExecutableProjectsAsync_FindsMultipleExecutableProjects()
Assert.Contains(executableProjects, p => p.FullName == winExeFile.FullName);
}
}