Skip to content

Commit b376496

Browse files
authored
Merge pull request #6059 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 4059948 + 52ce37c commit b376496

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

docs/containers/container-build.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ EXPOSE 80
2626
EXPOSE 443
2727
```
2828

29-
The lines in the Dockerfile begin with the Nano Server image from Microsoft Container Registry (mcr.microsoft.com) and create an intermediate image `base` that exposes ports 80 and 443, and sets the working directory to `/app`.
29+
The lines in the Dockerfile begin with the Debian image from Microsoft Container Registry (mcr.microsoft.com) and create an intermediate image `base` that exposes ports 80 and 443, and sets the working directory to `/app`.
3030

3131
The next stage is `build`, which appears as follows:
3232

docs/containers/tutorial-multicontainer.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ Add a project to the same solution and call it *MyWebAPI*. Select **API** as the
7878
}
7979
}
8080
```
81+
82+
> [!NOTE]
83+
> In real-world code, you shouldn't dispose `HttpClient` after every request. For best practices, see [Use HttpClientFactory to implement resilient HTTP requests](https://docs.microsoft.com/dotnet/architecture/microservices/implement-resilient-applications/use-httpclientfactory-to-implement-resilient-http-requests).
8184
8285
For .NET Core 3.1 in Visual Studio 2019 or later, the Web API template uses a WeatherForecast API, so uncomment that line and comment out the line for ASP.NET 2.x.
8386

docs/msbuild/common-msbuild-project-properties.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ The following table lists frequently used properties that are defined in the Vis
7777
| OptionExplicit | A boolean value that when set to `true`, requires explicit declaration of variables in the source code. This property is equivalent to the `/optionexplicit` compiler switch. |
7878
| OptionInfer | A boolean value that when set to `true`, enables type inference of variables. This property is equivalent to the `/optioninfer` compiler switch. |
7979
| OptionStrict | A boolean value that when set to `true`, causes the build task to enforce strict type semantics to restrict implicit type conversions. This property is equivalent to the `/optionstrict` switch of the *vbc.exe* compiler. |
80+
| OutDir | Indicates the final output location for the project or solution. When building a solution, OutDir can be used to gather multiple project outputs in one location. In addition, OutDir is included in AssemblySearchPaths used for resolving references. For example, *bin\Debug*. |
8081
| OutputPath | Specifies the path to the output directory, relative to the project directory, for example, *bin\Debug*. |
8182
| OutputType | Specifies the file format of the output file. This parameter can have one of the following values:<br /><br /> - Library. Creates a code library. (Default value.)<br />- Exe. Creates a console application.<br />- Module. Creates a module.<br />- Winexe. Creates a Windows-based program.<br /><br /> This property is equivalent to the `/target` switch of the *vbc.exe* compiler. |
8283
| OverwriteReadOnlyFiles | A boolean value that indicates whether you want to enable the build to overwrite read-only files or trigger an error. |

pull_request_template.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
(You can replace all of this text with your description.)
21

2+
3+
<!--
34
Before creating your pull request, please check your content against these quality criteria:
45
56
- Did you consider search engine optimization (SEO) when you chose the title in the metadata section and the H1 heading (i.e. the displayed title that starts with a single #)?
@@ -9,3 +10,4 @@ Before creating your pull request, please check your content against these quali
910
- Should this page be linked to from other pages or Microsoft web sites?
1011
1112
For more information about creating content for docs.microsoft.com, see the contributor guide at https://docs.microsoft.com/contribute/.
13+
-->

0 commit comments

Comments
 (0)