Skip to content

Commit 1aac241

Browse files
committed
Fix the tests still expecting slnf files
1 parent df6b1d3 commit 1aac241

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

docs/AddingNewProjects.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Sample PR of final result: https://github.com/dotnet/aspnetcore/pull/41945
55
## Creating a new project
66
1. Create a new folder that will house your `.csproj` and other project-related files.
77
2. (EXTREMELY IMPORTANT) Inside this new folder, make a new folder for the source files of your project. For regular functionality-adding project this will be called `src`. However, if you are adding a different kind of project, it will be called something more applicable (ex. `test/` for a test project).
8-
3. Open the `.slnf` you want to add your project to in VS (preferably via the `startvs.cmd` script located in the same folder as the `.slnf`). Then add a new `Solution Folder` in the new folder with the same name and location as the actual folder created in the first step.
8+
3. Open the `.slnx` you want to add your project to in VS (preferably via the `startvs.cmd` script located in the same folder as the `.slnx`). Then add a new `Solution Folder` in the new folder with the same name and location as the actual folder created in the first step.
99
4. Create the project via the VS `Add` menu (select the folder -> right click -> Add -> New Project... -> follow the wizard).
1010

1111
**Note:** (Only applicable to `src/` projects) Depending on what kind of project you are creating, VS will create different files in your project. You might also want to add the following files:
@@ -24,8 +24,8 @@ Sample PR of final result: https://github.com/dotnet/aspnetcore/pull/41945
2424
```
2525

2626
## Adding to the rest of the repo
27-
1. VS should have already registered your `.csproj` in the corresponding solution ([`.sln`](https://github.com/dotnet/aspnetcore/blob/586ccc8c895862b65645c4b0f979db1eecd29626/AspNetCore.slnx)) and solution filter ([`.slnf`](https://github.com/dotnet/aspnetcore/blob/586ccc8c895862b65645c4b0f979db1eecd29626/src/Middleware/Middleware.slnf#L107-L109)) files.
28-
- If VS has not already modified these files, open the `.slnf` you want to add the project to. Create a solution folder for your project if doesn't exist already. Then right click solution folder -> Add -> Existing Project... -> follow the wizard.
27+
1. VS should have already registered your `.csproj` in the corresponding solution ([`.slx`](https://github.com/dotnet/aspnetcore/blob/586ccc8c895862b65645c4b0f979db1eecd29626/AspNetCore.slnx)) and solution filter ([`.slnx`](https://github.com/dotnet/aspnetcore/blob/586ccc8c895862b65645c4b0f979db1eecd29626/src/Middleware/Middleware.slnx#L107-L109)) files.
28+
- If VS has not already modified these files, open the `.slnx` you want to add the project to. Create a solution folder for your project if doesn't exist already. Then right click solution folder -> Add -> Existing Project... -> follow the wizard.
2929
1. Run the `eng/scripts/GenerateProjectList.ps1` file to regenerate a number of `eng/*.props` files e.g. ProjectReferences.props.
3030

3131
**Note:** If you are adding a new project to the root `src` directory, you will also need to add a reference in both of the `DotNetProjects` lists of the `eng/Build.props` file. The first list (the one with condition `'$(BuildMainlyReferenceProviders)' != 'true'"`) has items in the format of:

docs/BuildErrors.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ Opening solution filters and building may produce an error code CS0006 with a me
3030

3131
> Error CS0006 Metadata file '…\AspNetCore\artifacts\bin\Microsoft.AspNetCore.Metadata\Debug\netstandard2.0\Microsoft.AspNetCore.Metadata.dll' could not be found
3232
33-
The cause of this problem is that the solution filter you are using does not include the project that produces this .dll. This most often occurs after we have added new projects to the repo, but failed to update our .sln/slnf files to include the new project. In some cases, it is sometimes the intended behavior of the .slnf which has been crafted to only include a subset of projects.
33+
The cause of this problem is that the solution filter you are using does not include the project that produces this .dll. This most often occurs after we have added new projects to the repo, but failed to update our .sln/slnx files to include the new project. In some cases, it is sometimes the intended behavior of the .slnx which has been crafted to only include a subset of projects.
3434

3535
### You can fix this in one of three ways
3636

3737
1. Build the project on command line. In most cases, running `build.cmd` on command line solves this problem.
3838
2. If the project is missing from the .sln file entirely, you can use `dotnet sln add` to add it, or else right click on the solution/folder in Visual Studio and choose Add->Existing Project.
39-
3. If it is present in the .sln, but not the .slnf, you can update the solution filter to include the missing project. You can either do this one by right-clicking on project in Visual Studio and choosing to load it's direct dependencies, and then saving. Alternatively, you can hand edit the .slnf file - it's a fairly simple json format.
39+
3. If it is present in the .sln, but not the .slnx, you can update the solution filter to include the missing project. You can either do this one by right-clicking on project in Visual Studio and choosing to load it's direct dependencies, and then saving. Alternatively, you can hand edit the .slnx file - it's a fairly simple json format.
4040

4141
## Error MSB4019: The imported project "…\artifacts\bin\GenerateFiles\Directory.Build.props" was not found
4242

docs/BuildFromSource.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ The steps you follow next depend on your preferred development environment:
7474
7575
We have a single _.sln_ file for all of ASP.NET Core, but most people don't work with it directly because Visual Studio doesn't currently handle projects of this scale very well.
7676
77-
Instead, we have many Solution Filter (.slnf) files which include a sub-set of projects. For more information on solution files, you can review the [official Visual Studio doc](https://learn.microsoft.com/visualstudio/ide/filtered-solutions).
77+
Instead, we have many Solution Filter (.slnx files which include a sub-set of projects. For more information on solution files, you can review the [official Visual Studio doc](https://learn.microsoft.com/visualstudio/ide/filtered-solutions).
7878
79-
These principles guide how we create and manage .slnf files:
79+
These principles guide how we create and manage .slnx files:
8080
8181
- Solution files are not used by CI or command line build scripts. They are meant for use by developers only.
8282
- Solution files group together projects which are frequently edited at the same time.
83-
- Can't find a solution that has the projects you care about? Feel free to make a PR to add a new .slnf file.
83+
- Can't find a solution that has the projects you care about? Feel free to make a PR to add a new .slnx file.
8484

8585
</details>
8686

docs/Trimming.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ The first step to trimming an ASP.NET Core assembly is adding it to `Linkability
2020

2121
1. Update the project file to enable trimming by adding `<IsTrimmable>true</IsTrimmable>`. This property configures the build to add metadata to the assembly to indicate it supports trimming. It also enables trimming analysis on the project.
2222
2. Run `eng/scripts/GenerateProjectList.ps1` to update the list of projects that are known to be trimmable. The script adds the project to the list of known trimmable projects at [`eng/TrimmableProjects.props`](../eng/TrimmableProjects.props).
23-
3. Open `src/Tools/Tools.slnf`
24-
4. Add the project to `Tools.slnf`:
23+
3. Open `src/Tools/Tools.slnx`
24+
4. Add the project to `Tools.slnx`:
2525
1. Right-click `LinkabilityCheck` and select *Load Direct Dependencies*.
2626
2. Update the solution filter.
2727
5. Build `LinkabilityChecker`.

src/Testing/src/TestPathUtilities.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static string GetSolutionRootDirectory(string solution)
1616

1717
do
1818
{
19-
var projectFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, $"{solution}.slnf"));
19+
var projectFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, $"{solution}.slnx"));
2020
if (projectFileInfo.Exists)
2121
{
2222
return projectFileInfo.DirectoryName;
@@ -27,7 +27,7 @@ public static string GetSolutionRootDirectory(string solution)
2727
{
2828
// Have reached the solution root. Work down through the src/ folder to find the solution filter.
2929
directoryInfo = new DirectoryInfo(Path.Combine(directoryInfo.FullName, "src"));
30-
foreach (var solutionFileInfo in directoryInfo.EnumerateFiles($"{solution}.slnf", SearchOption.AllDirectories))
30+
foreach (var solutionFileInfo in directoryInfo.EnumerateFiles($"{solution}.slnx", SearchOption.AllDirectories))
3131
{
3232
return solutionFileInfo.DirectoryName;
3333
}

0 commit comments

Comments
 (0)