Skip to content

Commit f1ca307

Browse files
authored
add slnx option (#45106)
1 parent 411e261 commit f1ca307

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

docs/core/project-sdk/msbuild-props-desktop.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ The following table shows which elements and [globs](https://en.wikipedia.org/wi
5252
| Element | Include glob | Exclude glob | Remove glob |
5353
|-----------------------|------------------------------|--------------|-------------|
5454
| ApplicationDefinition | App.xaml or Application.xaml | N/A | N/A |
55-
| Page | \*\*/\*.xaml | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln; \*\*/\*.vssscc<br>Any XAML defined by *ApplicationDefinition* | N/A |
55+
| Page | \*\*/\*.xaml | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln(x); \*\*/\*.vssscc<br>Any XAML defined by *ApplicationDefinition* | N/A |
5656
| None | N/A | N/A | \*\*/\*.xaml |
5757

5858
Here are the default include and exclude settings for all project types. For more information, see [Default includes and excludes](overview.md#default-includes-and-excludes).
5959

6060
| Element | Include glob | Exclude glob | Remove glob |
6161
|---------|--------------|--------------|-------------|
62-
| Compile | \*\*/\*.cs; \*\*/\*.vb (or other language extensions) | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln; \*\*/\*.vssscc | N/A |
63-
| EmbeddedResource | \*\*/\*.resx | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln; \*\*/\*.vssscc | N/A |
64-
| None | \*\*/\* | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln; \*\*/\*.vssscc | \*\*/\*.cs; \*\*/\*.resx |
62+
| Compile | \*\*/\*.cs; \*\*/\*.vb (or other language extensions) | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln(x); \*\*/\*.vssscc | N/A |
63+
| EmbeddedResource | \*\*/\*.resx | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln(x); \*\*/\*.vssscc | N/A |
64+
| None | \*\*/\* | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln(x); \*\*/\*.vssscc | \*\*/\*.cs; \*\*/\*.resx |
6565

6666
### Errors related to "duplicate" items
6767

docs/core/project-sdk/overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ The following table shows which elements and which [globs](https://en.wikipedia.
103103

104104
| Element | Include glob | Exclude glob | Remove glob |
105105
|---------|--------------|--------------|-------------|
106-
| Compile | \*\*/\*.cs (or other language extensions) | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln; \*\*/\*.vssscc | N/A |
107-
| EmbeddedResource | \*\*/\*.resx | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln; \*\*/\*.vssscc | N/A |
108-
| None | \*\*/\* | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln; \*\*/\*.vssscc | \*\*/\*.cs; \*\*/\*.resx |
106+
| Compile | \*\*/\*.cs (or other language extensions) | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln(x); \*\*/\*.vssscc | N/A |
107+
| EmbeddedResource | \*\*/\*.resx | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln(x); \*\*/\*.vssscc | N/A |
108+
| None | \*\*/\* | \*\*/\*.user; \*\*/\*.\*proj; \*\*/\*.sln(x); \*\*/\*.vssscc | \*\*/\*.cs; \*\*/\*.resx |
109109

110110
> [!NOTE]
111111
> The `./bin` and `./obj` folders, which are represented by the `$(BaseOutputPath)` and `$(BaseIntermediateOutputPath)` MSBuild properties, are excluded from the globs by default. Excludes are represented by the [DefaultItemExcludes property](msbuild-props.md#defaultitemexcludes).

docs/core/tools/dotnet-migrate.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Migration can be performed on the following assets:
3232

3333
* A single project by specifying the *project.json* file to migrate.
3434
* All of the directories specified in the *global.json* file by passing in a path to the *global.json* file.
35-
* A *solution.sln* file, where it migrates the projects referenced in the solution.
35+
* A *solution.sln(x)* file, where it migrates the projects referenced in the solution.
3636
* On all subdirectories of the given directory recursively.
3737

3838
The `dotnet migrate` command keeps the migrated *project.json* file inside a `backup` directory, which it creates if the directory doesn't exist. This behavior is overridden using the `--skip-backup` option.
@@ -49,7 +49,7 @@ The path to one of the following:
4949

5050
* a *project.json* file to migrate.
5151
* a *global.json* file: the folders specified in *global.json* are migrated.
52-
* a *solution.sln* file: the projects referenced in the solution are migrated.
52+
* a *solution.sln(x)* file: the projects referenced in the solution are migrated.
5353
* a directory to migrate: recursively searches for *project.json* files to migrate inside the specified directory.
5454

5555
Defaults to current directory if nothing is specified.

docs/core/tools/dotnet-publish.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ For more information, see the following resources:
120120

121121
* `PROJECT` is the path and filename of a C#, F#, or Visual Basic project file, or the path to a directory that contains a C#, F#, or Visual Basic project file. If the directory is not specified, it defaults to the current directory.
122122

123-
* `SOLUTION` is the path and filename of a solution file (*.sln* extension), or the path to a directory that contains a solution file. If the directory is not specified, it defaults to the current directory.
123+
* `SOLUTION` is the path and filename of a solution file (*.sln* or *.slnx* extension), or the path to a directory that contains a solution file. If the directory is not specified, it defaults to the current directory.
124124

125125
## Options
126126

0 commit comments

Comments
 (0)