Skip to content
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

Jump to bottom

Remove SlnFile references #45442

Open
wants to merge 23 commits into
base: release/9.0.2xx
Choose a base branch
from
Open

Remove SlnFile references #45442

wants to merge 23 commits into from

Conversation

edvilme
Copy link
Member

@edvilme edvilme commented Dec 12, 2024 •
edited
Loading

SlnFile is being replaced by vs-solutionpersistence as part of the efforts for .slnx support
This should be replaced in all remaining places it might be used

Contributes #40913

@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Dec 12, 2024
@edvilme edvilme changed the base branch from main to release/9.0.2xx January 6, 2025 22:33
@build-analysis build-analysis bot mentioned this pull request Jan 7, 2025
Open
This was referenced Jan 7, 2025
Open
Open
kasperk81
kasperk81 reviewed Jan 7, 2025
View reviewed changes
src/BuiltInTools/dotnet-format/Workspaces/MSBuildWorkspaceFinder.cs
@@ -76,8 +76,11 @@ private static (bool isSolution, string workspacePath) FindFile(string workspace
return (isSolution, workspacePath);
}

private static IEnumerable<string> FindSolutionFiles(string basePath) => Directory.EnumerateFileSystemEntries(basePath, "*.sln", SearchOption.TopDirectoryOnly)
.Concat(Directory.EnumerateFileSystemEntries(basePath, "*.slnf", SearchOption.TopDirectoryOnly));
private static IEnumerable<string> FindSolutionFiles(string basePath) => [
Copy link
Contributor

Choose a reason for hiding this comment

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

we can return string[] and use the array all the way to avoid .ToList in the end. it makes an unnecessary copy in FindMatchingFile to find count

@build-analysis build-analysis bot mentioned this pull request Jan 7, 2025
Open
@edvilme edvilme requested a review from a team January 8, 2025 22:13
@edvilme edvilme marked this pull request as ready for review January 8, 2025 22:13
@edvilme edvilme requested review from a team as code owners January 8, 2025 22:13
@edvilme edvilme requested review from a team and vijayrkn as code owners January 8, 2025 22:13
@edvilme edvilme changed the title (Draft) Remove SlnFile Remove SlnFile references Jan 8, 2025
Forgind
Forgind approved these changes Jan 8, 2025
View reviewed changes
Copy link
Member

@Forgind Forgind left a comment

Choose a reason for hiding this comment

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

Lot of deleted code! I guess it was all SlnFile-specific?

I think this at least mostly accomplishes your goal. I feel like we should better support slnf, as that's basically a sln*.

src/Cli/dotnet/ProjectInstanceExtensions.cs Outdated Show resolved Hide resolved
src/Cli/dotnet/ReleasePropertyProjectLocator.cs Outdated Show resolved Hide resolved
src/Cli/dotnet/ReleasePropertyProjectLocator.cs Outdated Show resolved Hide resolved
src/Cli/dotnet/ReleasePropertyProjectLocator.cs Show resolved Hide resolved
src/Cli/dotnet/ReleasePropertyProjectLocator.cs Show resolved Hide resolved
src/Cli/dotnet/SlnFileFactory.cs Outdated Show resolved Hide resolved
src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommand.cs Outdated Show resolved Hide resolved
src/Cli/dotnet/commands/dotnet-sln/remove/Program.cs Outdated Show resolved Hide resolved
@build-analysis build-analysis bot mentioned this pull request Jan 9, 2025
Open
@edvilme edvilme mentioned this pull request Jan 9, 2025
Open
jasonmalinowski
jasonmalinowski approved these changes Jan 9, 2025
View reviewed changes
Copy link
Member

@jasonmalinowski jasonmalinowski left a comment

Choose a reason for hiding this comment

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

Signing off for the MSBuildWorkspaceFinder.cs change which is owned by roslyn-ide; the rest is unreviewed.

@edvilme
Copy link
Member Author

edvilme commented Jan 10, 2025

@dotnet/source-build I have removed project Mcrosoft.DotNet.Cli.Sln.Internal but am getting source build errors. Should I be doing an additional step? Thanks!

@ellahathaway
Copy link
Member

@dotnet/source-build I have removed project Mcrosoft.DotNet.Cli.Sln.Internal but am getting source build errors. Should I be doing an additional step? Thanks!

Error is: /__w/1/s/artifacts/sb/src/source-build.slnf(1,1): error MSB4025: The project file could not be loaded. Data at the root level is invalid. Line 1, position 1.

I believe you will have to update source-build.slnf to reflect that you've removed Microsoft.DotNet.Cli.Sln.Internal

kasperk81
kasperk81 reviewed Jan 10, 2025
View reviewed changes
src/Cli/dotnet/SlnFileFactory.cs

namespace Microsoft.DotNet.Tools.Common
{
public static class SlnFileFactory
{
public static SlnFile CreateFromFileOrDirectory(string fileOrDirectory)
public static string[] ListSolutionFilesInDirectory(string directory, bool includeSolutionFilterFiles = false, bool includeSolutionXmlFiles = true)
Copy link
Contributor

Choose a reason for hiding this comment

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

this helper is used twice, both times with false,false. inline it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kasperk81 kasperk81 kasperk81 left review comments

@Forgind Forgind Forgind approved these changes

@jasonmalinowski jasonmalinowski jasonmalinowski approved these changes

@vijayrkn vijayrkn Awaiting requested review from vijayrkn vijayrkn is a code owner

Assignees
No one assigned
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@edvilme @ellahathaway @jasonmalinowski @Forgind @kasperk81