Remove SlnFile references
#45442
Open
Remove SlnFile references
#45442
+70
−3,557
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
edvilme
force-pushed
the
edvilme-slnfile
branch
from
f367673 to
e1d98ce
Compare
edvilme
force-pushed
the
edvilme-slnfile
branch
from
ab898f4 to
1627d33
Compare
kasperk81
reviewed
Jan 7, 2025
| @@ -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) => [ | |||
There was a problem hiding this comment.
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
Co-authored-by: kasperk81 <[email protected]>
edvilme
force-pushed
the
edvilme-slnfile
branch
from
258a269 to
24b44dc
Compare
Forgind
approved these changes
Jan 8, 2025
| @@ -22,7 +21,8 @@ public static string GetDefaultProjectTypeGuid(this ProjectInstance projectInsta | |||
| string projectTypeGuid = projectInstance.GetPropertyValue("DefaultProjectTypeGuid"); | |||
| if (string.IsNullOrEmpty(projectTypeGuid) && projectInstance.FullPath.EndsWith(".shproj", StringComparison.OrdinalIgnoreCase)) | |||
| { | |||
| projectTypeGuid = ProjectTypeGuids.SharedProjectGuid; | |||
| // TODO: Centralize project type guids | |||
| { | ||
| #pragma warning disable CS8604 // Possible null reference argument. | ||
| string projectFullPath = Path.Combine(Path.GetDirectoryName(sln.FullPath), project.FilePath); | ||
| string projectFullPath = Path.Combine(Path.GetDirectoryName(slnPath), project.FilePath); |
There was a problem hiding this comment.
Why does this method (in code that was from before this PR) do a Parallel.ForEach on a bunch of projects when you just want one? Seems wasteful
| { | ||
| return project.TypeGuid == solutionFolderGuid || project.TypeGuid == sharedProjectGuid || !IsValidProjectFilePath(projectFullPath); | ||
| return project.TypeId.ToString() == solutionFolderGuid || project.TypeId.ToString() == sharedProjectGuid || !IsValidProjectFilePath(projectFullPath); |
There was a problem hiding this comment.
Is TypeId always the same guid as it would've been had you used TypeGuid for a SlnProject?
There was a problem hiding this comment.
You mean if they're equivalent? In that case, yes
| @@ -262,7 +271,7 @@ private bool IsValidProjectFilePath(string path) | |||
| /// <returns>Returns true if the path exists and is a sln file type.</returns> | |||
| private bool IsValidSlnFilePath(string path) | |||
| { | |||
| return File.Exists(path) && Path.GetExtension(path).EndsWith("sln"); | |||
| return File.Exists(path) && (Path.GetExtension(path) == ".sln" || Path.GetExtension(path) == ".slnx"); | |||
There was a problem hiding this comment.
I think this does not currently support solution filter files
There was a problem hiding this comment.
I agree, but I guess my question is: why not?
There was a problem hiding this comment.
I think we could wait and see if/when vs-solutionpersistence implements support for slnf files before trying to parse them on our own
src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommand.cs
Outdated
Show resolved
Hide resolved
| @@ -78,6 +78,7 @@ public override int Execute() | |||
| { | |||
| throw new GracefulException(CommonLocalizableStrings.InvalidSolutionFormatString, solutionFileFullPath, ex.Message); | |||
| } | |||
| // TODO: Check | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SlnFileis being replaced by vs-solutionpersistence as part of the efforts for .slnx supportThis should be replaced in all remaining places it might be used
Contributes #40913