Remove `SlnFile` references by edvilme · Pull Request #45442 · dotnet/sdk

edvilme · 2024-12-12T19:52:36Z

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

kasperk81 · 2025-01-07T18:41:20Z

src/BuiltInTools/dotnet-format/Workspaces/MSBuildWorkspaceFinder.cs


-        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) => [


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 <83082615+kasperk81@users.noreply.github.com>

jasonmalinowski

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

edvilme · 2025-01-10T19:12:26Z

@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 · 2025-01-10T20:02:02Z

@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

src/Cli/dotnet/SlnFileFactory.cs

src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommand.cs

src/Cli/dotnet/ProjectInstanceExtensions.cs

src/Cli/dotnet/ReleasePropertyProjectLocator.cs

src/Cli/dotnet/SlnFileFactory.cs

src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommand.cs

src/Cli/dotnet/SlnFileFactory.cs

src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommand.cs

test/ArgumentsReflector/Properties/launchSettings.json

ghost added Area-Infrastructure untriaged Request triage from a team member labels Dec 12, 2024

edvilme force-pushed the edvilme-slnfile branch from f367673 to e1d98ce Compare January 6, 2025 22:32

edvilme changed the base branch from main to release/9.0.2xx January 6, 2025 22:33

build-analysis bot mentioned this pull request Jan 7, 2025

Template engine tests hitting known parallelism issue in GetVisualStudioInstances #44878

Open

edvilme force-pushed the edvilme-slnfile branch from ab898f4 to 1627d33 Compare January 7, 2025 00:45

This was referenced Jan 7, 2025

slow macOS - "##[error]The job running on agent Azure Pipelines 9 ran longer than the maximum time of 60 minutes." dotnet/dnceng#1883

Open

The Operation will be canceled. The next steps may not contain expected logs. dotnet/dnceng#3008

Open

kasperk81 reviewed Jan 7, 2025

View reviewed changes

build-analysis bot mentioned this pull request Jan 7, 2025

Failure on Helix tests - Tests timing out #40074

Open

edvilme and others added 15 commits January 8, 2025 14:03

sln-remove: Support for slnx

eea2d7f

WIP

5209ec1

Added edge cases

28a2e77

Fix tests' edge cases

6db4b17

Fix all tests

9e03453

sln-remove: Update tests

8c1044a

Nit

bca2475

Apply suggestions from code review

eb206be

Apply suggestions from code review

8e1e348

Co-authored-by: kasperk81 <83082615+kasperk81@users.noreply.github.com>

Remove SlnFile references

6e52aea

Remove SlnFile references

9046379

Fix typo

c8e0cb8

Update solution and project files

cc555bc

Remove tests

21e5da7

Look for .sln and .slnx files

24b44dc

edvilme force-pushed the edvilme-slnfile branch from 258a269 to 24b44dc Compare January 8, 2025 22:09

edvilme requested a review from a team January 8, 2025 22:13

edvilme marked this pull request as ready for review January 8, 2025 22:13

edvilme requested review from a team as code owners January 8, 2025 22:13

Centralize looking for sln(x/f) in directory

485a16a

build-analysis bot mentioned this pull request Jan 9, 2025

Microsoft.NET.Build.Containers.IntegrationTests are pulling from Docker Hub #42026

Closed

edvilme mentioned this pull request Jan 9, 2025

slnx support in the dotnet CLI #40913

Closed

jasonmalinowski approved these changes Jan 9, 2025

View reviewed changes

Nit: Pr comments

e047785

Dont look for slnx by default

e6b5114

edvilme added 3 commits January 10, 2025 13:10

Dont look for slnx by default

71f2896

Dont look for slnx by default

b0a612c

Remove Microsoft.DotNet.Cli.Sln.Internal.csproj from filtered solution

8933103

kasperk81 reviewed Jan 10, 2025

View reviewed changes

src/Cli/dotnet/SlnFileFactory.cs Show resolved Hide resolved

kasperk81 reviewed Jan 10, 2025

View reviewed changes

src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommand.cs Outdated Show resolved Hide resolved

edvilme added 4 commits January 10, 2025 13:36

Disable slnx search by default

3587ccd

Fix tests and paths

fb06ef5

Fix test

0ea98a3

dotnet-list: Fix tests

f9531f1

build-analysis bot mentioned this pull request Jan 13, 2025

The active test run was aborted. Reason: Test host process crashed dotnet/dnceng#451

Closed

3 tasks

edvilme requested a review from Forgind January 13, 2025 22:43

Forgind approved these changes Jan 13, 2025

View reviewed changes

Nit: PR comments

24a6cdc

edvilme enabled auto-merge (squash) January 13, 2025 23:05

MiYanni approved these changes Jan 13, 2025

View reviewed changes

NIT: PR Comments

ca26356

This was referenced Jan 14, 2025

Checkout failure: "Git fetch failed with exit code 128" dotnet/arcade#9009

Open

Unable to checkout dotnet/dnceng#4115

Open

edvilme merged commit 4795c3e into dotnet:release/9.0.2xx Jan 14, 2025

edvilme mentioned this pull request Mar 10, 2025

WorkloadRestoreCommand.DiscoverAllProjects: Return full paths #47415

Merged

sharwell mentioned this pull request Mar 12, 2025

Fix dotnet format failure to handle slnx files #47508

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove `SlnFile` references#45442

Remove `SlnFile` references#45442
edvilme merged 27 commits intodotnet:release/9.0.2xxfrom
edvilme:edvilme-slnfile

edvilme commented Dec 12, 2024 •

edited

Loading

Uh oh!

kasperk81 Jan 7, 2025

Uh oh!

jasonmalinowski left a comment

Uh oh!

edvilme commented Jan 10, 2025

Uh oh!

ellahathaway commented Jan 10, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

edvilme commented Dec 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kasperk81 Jan 7, 2025

Choose a reason for hiding this comment

Uh oh!

jasonmalinowski left a comment

Choose a reason for hiding this comment

Uh oh!

edvilme commented Jan 10, 2025

Uh oh!

ellahathaway commented Jan 10, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

edvilme commented Dec 12, 2024 •

edited

Loading