Skip to content

Commit 0ccfe84

Browse files
committed
Merge branch 'msbuild-slnx' of github.com:ghogen/vsdocs into msbuild-slnx
2 parents 068b67b + 1191691 commit 0ccfe84

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

docs/msbuild/build-process-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The next sections are about the input files, such as solution files or project f
2424

2525
### Solutions and projects
2626

27-
MSBuild instances may consist of one project, or many projects as part of a solution. Solution files may be in the `.slnx` format or the `.sln` format. The solution file (`.sln`) isn't an MSBuild XML file, but MSBuild interprets it to know all the projects that are required to be built for the given configuration and platform settings. When MSBuild processes this input, it's referred to as the solution build. It has some extensible points that allow you to run something at every solution build, but since this build is a separate run from the individual project builds, no settings of properties or target definitions from the solution build are relevant to each project build.
27+
MSBuild instances may consist of one project, or many projects as part of a solution. Solution files in the `.slnx` format or the `.sln` format are both supported (in MSBuild 17.12 and later). The solution file (`.sln`) isn't an MSBuild XML file, but MSBuild interprets it to know all the projects that are required to be built for the given configuration and platform settings. When MSBuild processes this input, it's referred to as the solution build. It has some extensible points that allow you to run something at every solution build, but since this build is a separate run from the individual project builds, no settings of properties or target definitions from the solution build are relevant to each project build.
2828

2929
You can find out how to extend the solution build at [Customize the solution build](customize-solution-build.md).
3030

docs/msbuild/msbuild-command-line-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The .NET CLI commands [dotnet build](/dotnet/core/tools/dotnet-build), [dotnet p
3232

3333
|Argument|Description|
3434
|--------------|-----------------|
35-
|`ProjectFile`|Builds the targets in the project file that you specify. If you don't specify a project file, MSBuild searches the current working directory for a file name extension that ends in *proj* and uses that file. You can also specify a Visual Studio solution file for this argument. In Visual Studio 17.13 and later, the `.slnx` solution file format is supported, as well as the `.sln` format. Both `.sln` and `.slnx` files for the same solution can be present in the same directory; if both are present, you must explicitly specify one of them to build the solution. |
35+
|`ProjectFile`|Builds the targets in the project file that you specify. If you don't specify a project file, MSBuild searches the current working directory for a file name extension that ends in *proj* and uses that file. You can also specify a Visual Studio solution file for this argument. In Visual Studio 17.12 and later, the `.slnx` solution file format is supported, as well as the `.sln` format. Both `.sln` and `.slnx` files for the same solution can be present in the same directory; if both are present, you must explicitly specify one of them to build the solution. |
3636

3737
## Switches
3838

docs/msbuild/msbuild-task.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Builds MSBuild projects from another MSBuild project.
4747

4848
Unlike using the [Exec task](../msbuild/exec-task.md) to start *MSBuild.exe*, this task uses the same MSBuild process to build the child projects. The list of already-built targets that can be skipped is shared between the parent and child builds. This task is also faster because no new MSBuild process is created.
4949

50-
This task can process not only project files but also solution files. In MSBuild 17.13 and later, both `.slnx` and `.sln` solution file formats are accepted.
50+
This task can process not only project files but also solution files. In MSBuild 17.12 and later, both `.slnx` and `.sln` solution file formats are accepted.
5151

5252
Any configuration that is required by MSBuild to enable projects to build at the same time, even if the configuration involves remote infrastructure (for example, ports, protocols, time-outs, retries, and so forth), must be made configurable by using a configuration file. When possible, configuration items should be able to be specified as task parameters on the `MSBuild` task.
5353

docs/msbuild/whats-new-msbuild-17-0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ In MSBuild 17.8 and later, try the new Terminal Logger (`-terminalLogger` or `-t
5555
## Other behavior changes
5656

5757
- `MSBuildCopyContentTransitively` is now on by default, ensuring consistency in output folders on incremental builds.
58-
- In MSBuild 17.12 and later, MSBuild can build solution files in the `.slnx` format. See [MSBuild command-line reference](./msbuild-command-line-reference.md).
58+
- In MSBuild 17.12 and later, MSBuild can build solution files in the `.slnx` format. See [MSBuild command-line reference](./msbuild-command-line-reference.md). For information about the `.slnx` solution file format, see [New, simpler solution file format](https://devblogs.microsoft.com/visualstudio/new-simpler-solution-file-format/).
5959

6060
For more changes in this version, see the detailed release notes and for changes in MSBuild versions that you can opt out of, see [change waves](change-waves.md).
6161

0 commit comments

Comments
 (0)