Skip to content

Commit 4b9cc94

Browse files
committed
Merge branch 'master' into linq-to-xml
2 parents 0a3f1ee + 5494a07 commit 4b9cc94

File tree

1,579 files changed

+10397
-6818
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,579 files changed

+10397
-6818
lines changed

.ghal.rules.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"version": 3,
3-
"configRevision": 1,
3+
"configRevision": 2,
44

55
"issue": {
66
"opened": {
@@ -47,6 +47,9 @@
4747
},
4848
"(?i)dotnet-architecture$": {
4949
"labels-add": ":books: Area - .NET Architecture Guide"
50+
},
51+
"(?i)azure-dotnet$": {
52+
"labels-add": ":books: Area - Azure .NET SDK"
5053
}
5154
},
5255
"technology": {
@@ -133,7 +136,7 @@
133136
"(?i).*docs\/whats-new\/.*": {
134137
"labels-add": ":star2: What's New"
135138
}
136-
}
139+
}
137140
},
138141
"processor-meta-custom": {
139142
"issuetype": {
@@ -267,6 +270,9 @@
267270
},
268271
"(?i).*docs\/whats-new\/.*": {
269272
"labels-add": ":star2: What's New"
273+
},
274+
"(?i).*docs\/azure\/.*": {
275+
"labels-add": ":books: Area - Azure .NET SDK"
270276
}
271277
}
272278
}

.github/workflows/markdownlint.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ on:
44
push:
55
paths:
66
- "**/*.md"
7+
- ".github/workflows/markdownlint.yml"
78
pull_request:
89
paths:
910
- "**/*.md"
11+
- ".github/workflows/markdownlint.yml"
1012

1113
jobs:
1214
lint:

.markdownlint.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"default": true,
33
"MD001": false,
44
"MD004": false,
5-
"MD009": false,
65
"MD013": false,
76
"MD022": false,
87
"MD024": false,

.openpublishing.redirection.json

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,62 @@
8989
"source_path": "docs/architecture/modernize-with-azure-containers/lift-and-shift-existing-apps-devops/microsoft-technologies-in-cloud-devops-ready-applications.md",
9090
"redirect_url": "/dotnet/architecture/modernize-with-azure-containers/modernize-existing-apps-to-cloud-optimized/microsoft-technologies-in-cloud-optimized-applications"
9191
},
92+
{
93+
"source_path": "docs/azure/dotnet-howto-choose-migration.md",
94+
"redirect_url": "/dotnet/azure/migration/choose"
95+
},
96+
{
97+
"source_path": "docs/azure/dotnet-howto-migrate-app-service.md",
98+
"redirect_url": "/dotnet/azure/migration/app-service"
99+
},
100+
{
101+
"source_path": "docs/azure/dotnet-howto-migrate-sql.md",
102+
"redirect_url": "/dotnet/azure/migration/sql"
103+
},
104+
{
105+
"source_path": "docs/azure/dotnet-howto-migrate-vm.md",
106+
"redirect_url": "/dotnet/azure/migration/vm"
107+
},
108+
{
109+
"source_path": "docs/azure/dotnet-quickstart-vs.md",
110+
"redirect_url": "/visualstudio/deployment/quickstart-deploy-to-azure?view=vs-2019"
111+
},
112+
{
113+
"source_path": "docs/azure/dotnet-quickstart-xplat.md",
114+
"redirect_url": "/azure/app-service/app-service-web-tutorial-dotnetcore-sqldb"
115+
},
116+
{
117+
"source_path": "docs/azure/dotnet-samples.md",
118+
"redirect_url": "/dotnet/azure/"
119+
},
120+
{
121+
"source_path": "docs/azure/dotnet-sdk-azure-authenticate.md",
122+
"redirect_url": "/dotnet/azure/sdk/authentication"
123+
},
124+
{
125+
"source_path": "docs/azure/dotnet-sdk-azure-concepts.md",
126+
"redirect_url": "/dotnet/azure/sdk"
127+
},
128+
{
129+
"source_path": "docs/azure/dotnet-sdk-azure-get-started.md",
130+
"redirect_url": "/dotnet/azure/intro"
131+
},
132+
{
133+
"source_path": "docs/azure/dotnet-sdk-azure-overview.md",
134+
"redirect_url": "/dotnet/azure/sdk"
135+
},
136+
{
137+
"source_path": "docs/azure/dotnet-sdk-vs2015-install.md",
138+
"redirect_url": "/dotnet/azure/sdk/vs2015-install"
139+
},
140+
{
141+
"source_path": "docs/azure/dotnet-tools.md",
142+
"redirect_url": "/dotnet/azure/sdk/tools"
143+
},
144+
{
145+
"source_path": "docs/azure/dotnet-tutorials.md",
146+
"redirect_url": "/dotnet/azure/"
147+
},
92148
{
93149
"source_path": "docs/cli-preview3/tools/dotnet-nuget-delete.md",
94150
"redirect_url": "/dotnet/core/tools/dotnet-nuget-delete"
@@ -163,7 +219,7 @@
163219
},
164220
{
165221
"source_path": "docs/core/install/linux-package-managers.md",
166-
"redirect_url": "/dotnet/core/install/linux-package-manager-ubuntu-1904",
222+
"redirect_url": "/dotnet/core/install/linux-package-manager-ubuntu-1910",
167223
"ms.custom": "updateeachrelease"
168224
},
169225
{

docfx.json

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,31 @@
4545
"exclude": [
4646
"**/README.md",
4747
"inactive/**",
48-
"rejected/**" ]
48+
"rejected/**",
49+
50+
"csharp-6.0/enum-base-type.md",
51+
52+
"csharp-7.0/expression-bodied-everything.md",
53+
"csharp-7.0/ref-locals-returns.md",
54+
"csharp-7.0/tuples.md",
55+
"csharp-7.0/value-task.md",
56+
57+
"csharp-7.2/readonly-struct.md",
58+
"csharp-7.2/ref-extension-methods.md",
59+
"csharp-7.2/ref-struct-and-span.md",
60+
61+
"csharp-7.3/enum-delegate-constraints.md",
62+
"csharp-7.3/ref-loops.md",
63+
64+
"csharp-8.0/alternative-interpolated-verbatim.md",
65+
"csharp-8.0/async-using.md",
66+
"csharp-8.0/constraints-in-overrides.md",
67+
"csharp-8.0/constructed-unmanaged.md",
68+
"csharp-8.0/notnull-constraint.md",
69+
"csharp-8.0/obsolete-accessor.md",
70+
"csharp-8.0/shadowing-in-nested-functions.md",
71+
"csharp-8.0/unconstrained-null-coalescing.md"
72+
]
4973
},
5074
{
5175
"files": [
@@ -135,6 +159,8 @@
135159
"docs/framework/xaml-services/**/**.md": "None"
136160
},
137161
"feedback_product_url": {
162+
"docs/azure/sdk/**/**.md": "https://github.com/azure/azure-sdk-for-net",
163+
"docs/azure/sdk/**/**.yml": "https://github.com/azure/azure-sdk-for-net",
138164
"docs/fsharp/**/**.md": "https://github.com/Microsoft/visualfsharp",
139165
"docs/machine-learning/**/**.md": "https://github.com/dotnet/machinelearning",
140166
"docs/standard/data/sqlite/**/*.md": "https://github.com/aspnet/EntityFrameworkCore"
@@ -143,6 +169,8 @@
143169
"_csharplang/**/*.md": "dotnet-csharp",
144170
"_vblang/spec/*.md": "dotnet-visualbasic",
145171
"docs/architecture/**/**.md": "dotnet-architecture",
172+
"docs/azure/**/**.md": "azure-dotnet",
173+
"docs/azure/**/**.yml": "azure-dotnet",
146174
"docs/core/**/**.md": "dotnet-core",
147175
"docs/csharp/**/**.md": "dotnet-csharp",
148176
"docs/csharp/**/**.yml": "dotnet-csharp",
@@ -158,6 +186,7 @@
158186
"ms.topic": {
159187
"_csharplang/**/*.md": "language-reference",
160188
"_vblang/spec/*.md": "language-reference",
189+
"docs/azure/**/**.md": "conceptual",
161190
"docs/csharp/language-reference/**/**.md": "language-reference",
162191
"docs/framework/additional-apis/**/**.md": "managed-reference",
163192
"docs/framework/unmanaged-api/**/**.md": "reference",
@@ -174,6 +203,8 @@
174203
"docs/visual-basic/**/**.md": "vb"
175204
},
176205
"author": {
206+
"docs/azure/**/**.md": "camsoper",
207+
"docs/azure/**/**.yml": "camsoper",
177208
"docs/architecture/**/**.md": "nishanil",
178209
"docs/architecture/grpc-for-wcf-developers/**/**.md": "shirhatti",
179210
"docs/core/**/**.md": "tdykstra",
@@ -260,6 +291,8 @@
260291
"_vblang/spec/*.md": "wiwagn",
261292
"docs/architecture/**/**.md": "nanil",
262293
"docs/architecture/grpc-for-wcf-developers/**/**.md": "soshir",
294+
"docs/azure/**/**.md": "casoper",
295+
"docs/azure/**/**.yml": "casoper",
263296
"docs/core/**/**.md": "dotnetcontent",
264297
"docs/core/compatibility/**/**.md": "gewarren",
265298
"docs/core/deploying/**/**.md": "adegeo",

docs/architecture/blazor-for-web-forms-developers/components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Or you can generate a list of items using a normal C# `foreach` loop like this:
4949
<ul>
5050
@foreach (var item in items)
5151
{
52-
<li>item.Text</li>
52+
<li>@item.Text</li>
5353
}
5454
</ul>
5555
```

docs/architecture/blazor-for-web-forms-developers/migration.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,7 @@ The following snippet demonstrates how the Web Forms eShop project uses *web.con
577577
<add key="UseMockData" value="true" />
578578
<add key="UseCustomizationData" value="false" />
579579
</appSettings>
580+
</configuration>
580581
```
581582

582583
It's common for secrets, such as database connection strings, to be stored within the *web.config*. The secrets are inevitably persisted in unsecure locations, such as source control. With Blazor on ASP.NET Core, the preceding XML-based configuration is replaced with the following JSON:

docs/architecture/grpc-for-wcf-developers/protobuf-reserved.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.date: 09/09/2019
66

77
# Protobuf reserved fields
88

9-
The backward-compatibility guarantees in Protocol Buffer (Protobuf) rely on field numbers always representing the same data item. If a field is removed from a message in a new version of the service, that field number should never be reused. You can enfore this by using the `reserved` keyword.
9+
The backward-compatibility guarantees in Protocol Buffer (Protobuf) rely on field numbers always representing the same data item. If a field is removed from a message in a new version of the service, that field number should never be reused. You can enforce this by using the `reserved` keyword.
1010

1111
If the `displayName` and `marketId` fields were removed from the `Stock` message defined earlier, their field numbers should be reserved as in the following example.
1212

docs/architecture/grpc-for-wcf-developers/rpc-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ In WCF, the [ServiceContract](xref:System.ServiceModel.ServiceContractAttribute)
120120

121121
## WCF one-way operations and gRPC client streaming
122122

123-
WCF provides one-way operations (marked with `[OperationContract(IsOneWay = true)]`) that return a transport-specific acknowledgement. gRPC service methods always return a response, even if it's empty. The client should always await that response. For the "fire-and-forget" style of messaging in gRPC, you can create a client streaming service.
123+
WCF provides one-way operations (marked with `[OperationContract(IsOneWay = true)]`) that return a transport-specific acknowledgment. gRPC service methods always return a response, even if it's empty. The client should always await that response. For the "fire-and-forget" style of messaging in gRPC, you can create a client streaming service.
124124

125125
### thing_log.proto
126126

docs/architecture/grpc-for-wcf-developers/self-hosted.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ ExecStart=/usr/sbin/myapp
102102
WantedBy=multi-user.target
103103
```
104104

105-
The `Type=notify` property tells `systemd` that the application will notify it on startup and shutdown. The `WantedBy=multi-user.target` setting will cause the service to start when the Linux system reaches "runlevel 2," which means a non-graphical multi-user shell is active.
105+
The `Type=notify` property tells `systemd` that the application will notify it on startup and shutdown. The `WantedBy=multi-user.target` setting will cause the service to start when the Linux system reaches "runlevel 2," which means a non-graphical, multi-user shell is active.
106106

107107
Before `systemd` will recognize the service, it needs to reload its configuration. You control `systemd` by using the `systemctl` command. After reloading, use the `status` subcommand to confirm that the application has registered successfully.
108108

@@ -147,7 +147,7 @@ sudo journalctl -u myapp
147147
> [!TIP]
148148
> If you have a GUI environment available on your host, a few graphical log viewers are available for Linux, such as *QJournalctl* and *gnome-logs*.
149149
150-
To learn more about querying the `systemd` journal from the command line by using `journalctl`, see [the man pages](https://manpages.debian.org/buster/systemd/journalctl.1).
150+
To learn more about querying the `systemd` journal from the command line by using `journalctl`, see [the manpages](https://manpages.debian.org/buster/systemd/journalctl.1).
151151

152152
## HTTPS certificates for self-hosted applications
153153

0 commit comments

Comments
 (0)