Skip to content

Commit 71e2fbd

Browse files
authored
Merge pull request #4592 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)
2 parents 6f49121 + ba4fad2 commit 71e2fbd

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

docs/msbuild/import-element-msbuild.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Imports the contents of one project file into another project file.
4141
|---------------|-----------------|
4242
|`Project`|Required attribute.<br /><br /> The path of the project file to import. The path can include wildcards. The matching files are imported in sorted order. By using this feature, you can add code to a project just by adding the code file to a directory.|
4343
|`Condition`|Optional attribute.<br /><br /> A condition to be evaluated. For more information, see [Conditions](../msbuild/msbuild-conditions.md).|
44+
|`Sdk`| Optional attribute.<br /><br /> References a project SDK.|
4445

4546
### Child elements
4647
None

docs/test/configure-unit-tests-by-using-a-dot-runsettings-file.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The following XML shows the contents of a typical *.runsettings* file. Each elem
7676
<!-- Configurations that affect the Test Framework -->
7777
<RunConfiguration>
7878
<MaxCpuCount>1</MaxCpuCount>
79-
<!-- Path relative to solution directory -->
79+
<!-- Path relative to directory that contains .runsettings file-->
8080
<ResultsDirectory>.\TestResults</ResultsDirectory>
8181

8282
<!-- x86 or x64 -->

0 commit comments

Comments
 (0)