Skip to content

Commit 73aa965

Browse files
authored
Merge pull request #18027 from dotnet/publish-31894
Merge master into live
2 parents 348bb05 + fe8b0f1 commit 73aa965

File tree

96 files changed

+889
-1225
lines changed

Some content is hidden

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

96 files changed

+889
-1225
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
# Base types
132132
/docs/standard/base-types/ @Thraka
133133
# Collections
134-
/docs/standard/collections/ @BillWagner
134+
/docs/standard/collections/ @IEvangelist
135135
# Data
136136
/docs/standard/data/ @gewarren
137137
# Data - SQLite
@@ -161,7 +161,7 @@
161161
# Native Interop
162162
/docs/standard/native-interop/ @jkoritzinsky
163163
# Parallel programming
164-
/docs/standard/parallel-programming/ @BillWagner
164+
/docs/standard/parallel-programming/ @IEvangelist
165165
# Security
166166
/docs/standard/security/ @IEvangelist
167167
# Serialization

.openpublishing.redirection.json

Lines changed: 69 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,10 @@
186186
"source_path": "docs/core/deploying/applications.md",
187187
"redirect_url": "/dotnet/core/deploying/index"
188188
},
189+
{
190+
"source_path": "docs/core/deploying/reducing-dependencies.md",
191+
"redirect_url": "/dotnet/core/tools/dependencies"
192+
},
189193
{
190194
"source_path": "docs/core/docker/visual-studio-tools-for-docker.md",
191195
"redirect_url": "https://docs.microsoft.com/aspnet/core/host-and-deploy/docker/visual-studio-tools-for-docker"
@@ -601,6 +605,10 @@
601605
"source_path": "docs/csharp/getting-started/with-visual-studio.md",
602606
"redirect_url": "/dotnet/core/tutorials/with-visual-studio"
603607
},
608+
{
609+
"source_path": "docs/csharp/implicitly-typed-lambda-expressions.md",
610+
"redirect_url": "/dotnet/csharp/programming-guide/statements-expressions-operators"
611+
},
604612
{
605613
"source_path": "docs/csharp/interactive-with-bash.md",
606614
"redirect_url": "/dotnet/csharp/index"
@@ -1065,6 +1073,10 @@
10651073
"source_path": "docs/csharp/language-reference/operators/xor-operator.md",
10661074
"redirect_url": "/dotnet/csharp/language-reference/operators/boolean-logical-operators#logical-exclusive-or-operator-"
10671075
},
1076+
{
1077+
"source_path": "docs/csharp/local-functions-vs-lambdas.md",
1078+
"redirect_url": "/dotnet/csharp/programming-guide/classes-and-structs/local-functions"
1079+
},
10681080
{
10691081
"source_path": "docs/csharp/methods-lambda-expressions.md",
10701082
"redirect_url": "/dotnet/csharp/programming-guide/statements-expressions-operators/lambda-expressions"
@@ -1073,6 +1085,10 @@
10731085
"source_path": "docs/csharp/namespaces-and-assemblies.md",
10741086
"redirect_url": "/dotnet/csharp/programming-guide/namespaces/index"
10751087
},
1088+
{
1089+
"source_path": "docs/csharp/nullable-attributes.md",
1090+
"redirect_url": "/dotnet/csharp/nullable-migration-strategies"
1091+
},
10761092
{
10771093
"source_path": "docs/csharp/parallel.md",
10781094
"redirect_url": "/dotnet/standard/parallel-programming/index"
@@ -3287,18 +3303,12 @@
32873303
"ms.custom": "updateeachrelease"
32883304
},
32893305
{
3290-
"source_path": "docs/machine-learning/tutorials/taxi-fare.md",
3291-
"redirect_url": "/dotnet/machine-learning/tutorials/predict-prices",
3292-
"redirect_document_id": true
3306+
"source_path": "docs/machine-learning/automl-overview.md",
3307+
"redirect_url": "/dotnet/machine-learning/automate-training-with-model-builder"
32933308
},
32943309
{
3295-
"source_path": "docs/machine-learning/tutorials/movie-recommmendation.md",
3296-
"redirect_url": "/dotnet/machine-learning/tutorials/movie-recommendation",
3297-
"redirect_document_id": true
3298-
},
3299-
{
3300-
"source_path": "docs/machine-learning/tutorials/ml-cli.md",
3301-
"redirect_url": "/dotnet/machine-learning/tutorials/sentiment-analysis-cli",
3310+
"source_path": "docs/machine-learning/basic-concepts-model-training-in-mldotnet.md",
3311+
"redirect_url": "/dotnet/machine-learning/how-does-mldotnet-work",
33023312
"redirect_document_id": true
33033313
},
33043314
{
@@ -3356,6 +3366,14 @@
33563366
"redirect_url": "/dotnet/machine-learning/how-to-guides/train-machine-learning-model-ml-net",
33573367
"redirect_document_id": true
33583368
},
3369+
{
3370+
"source_path": "docs/machine-learning/how-to-guides/use-gams-for-model-explainability.md",
3371+
"redirect_url": "/dotnet/machine-learning/how-to-guides/explain-machine-learning-model-permutation-feature-importance-ml-net"
3372+
},
3373+
{
3374+
"source_path": "docs/machine-learning/how-to-guides/verify-model-quality-ml-net.md",
3375+
"redirect_url": "/dotnet/machine-learning/how-to-guides/"
3376+
},
33593377
{
33603378
"source_path": "docs/machine-learning/resources/basics.md",
33613379
"redirect_url": "/dotnet/machine-learning/how-does-mldotnet-work"
@@ -3365,8 +3383,18 @@
33653383
"redirect_url": "/dotnet/machine-learning/how-does-mldotnet-work"
33663384
},
33673385
{
3368-
"source_path": "docs/machine-learning/basic-concepts-model-training-in-mldotnet.md",
3369-
"redirect_url": "/dotnet/machine-learning/how-does-mldotnet-work",
3386+
"source_path": "docs/machine-learning/tutorials/taxi-fare.md",
3387+
"redirect_url": "/dotnet/machine-learning/tutorials/predict-prices",
3388+
"redirect_document_id": true
3389+
},
3390+
{
3391+
"source_path": "docs/machine-learning/tutorials/movie-recommmendation.md",
3392+
"redirect_url": "/dotnet/machine-learning/tutorials/movie-recommendation",
3393+
"redirect_document_id": true
3394+
},
3395+
{
3396+
"source_path": "docs/machine-learning/tutorials/ml-cli.md",
3397+
"redirect_url": "/dotnet/machine-learning/tutorials/sentiment-analysis-cli",
33703398
"redirect_document_id": true
33713399
},
33723400
{
@@ -3657,7 +3685,7 @@
36573685
},
36583686
{
36593687
"source_path": "docs/standard/garbagecollection/gc.md",
3660-
"redirect_url": "/dotnet/standard/garbage-collection/gc"
3688+
"redirect_url": "/dotnet/standard/garbage-collection/fundamentals"
36613689
},
36623690
{
36633691
"source_path": "docs/standard/garbagecollection/implementing-dispose.md",
@@ -3687,6 +3715,10 @@
36873715
"source_path": "docs/standard/garbagecollection/weak-references.md",
36883716
"redirect_url": "/dotnet/standard/garbage-collection/weak-references"
36893717
},
3718+
{
3719+
"source_path": "docs/standard/garbage-collection/gc.md",
3720+
"redirect_url": "/dotnet/standard/garbage-collection/fundamentals"
3721+
},
36903722
{
36913723
"source_path": "docs/standard/garbage-collection/memory-management-and-gc.md",
36923724
"redirect_url": "/dotnet/standard/garbage-collection/index"
@@ -3745,6 +3777,10 @@
37453777
"source_path": "docs/standard/serialization/add-element-for-xmlschemaimporterextensions.md",
37463778
"redirect_url": "/dotnet/standard/serialization/add-element-for-schemaimporterextensions"
37473779
},
3780+
{
3781+
"source_path": "docs/standard/serialization/custom-serialization-order-with-xmlserializer.md",
3782+
"redirect_url": "/dotnet/standard/serialization/xml-and-soap-serialization"
3783+
},
37483784
{
37493785
"source_path": "docs/standard/serialization/marshal-by-value.md",
37503786
"redirect_url": "/dotnet/standard/serialization/serialization-concepts"
@@ -3753,6 +3789,18 @@
37533789
"source_path": "docs/standard/serialization/persistent-storage.md",
37543790
"redirect_url": "/dotnet/standard/serialization/serialization-concepts"
37553791
},
3792+
{
3793+
"source_path": "docs/standard/serialization/samples-binary.md",
3794+
"redirect_url": "/dotnet/standard/serialization/basic-serialization-technology-sample"
3795+
},
3796+
{
3797+
"source_path": "docs/standard/serialization/samples-xml.md",
3798+
"redirect_url": "/dotnet/standard/serialization/xml-and-soap-serialization"
3799+
},
3800+
{
3801+
"source_path": "docs/standard/serialization/schemaimporterextension-technology-sample.md",
3802+
"redirect_url": "/dotnet/standard/serialization/basic-serialization-technology-sample"
3803+
},
37563804
{
37573805
"source_path": "docs/standard/serialization/serialization-how-to-topics.md",
37583806
"redirect_url": "/dotnet/standard/serialization/how-to-serialize-an-object"
@@ -3765,6 +3813,14 @@
37653813
"source_path": "docs/standard/serialization/serialization-tools.md",
37663814
"redirect_url": "/dotnet/standard/serialization/xml-serializer-generator-tool-sgen-exe"
37673815
},
3816+
{
3817+
"source_path": "docs/standard/serialization/version-tolerant-serialization-technology-sample.md",
3818+
"redirect_url": "/dotnet/standard/serialization/basic-serialization-technology-sample"
3819+
},
3820+
{
3821+
"source_path": "docs/standard/serialization/web-services-generics-serialization-technology-sample.md",
3822+
"redirect_url": "/dotnet/standard/serialization/basic-serialization-technology-sample"
3823+
},
37683824
{
37693825
"source_path": "docs/standard/serialization/web-services-ixmlserializable-technology-sample.md",
37703826
"redirect_url": "https://docs.microsoft.com/previous-versions/dotnet/netframework-4.0/h2byscsb(v=vs.100)"

docfx.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"docs/standard/asynchronous-programming-patterns/**/**.md": "billwagner",
264264
"docs/standard/attributes/**/**.md": "tdykstra",
265265
"docs/standard/base-types/**/**.md": "Thraka",
266-
"docs/standard/collections/**/**.md": "billwagner",
266+
"docs/standard/collections/**/**.md": "IEvangelist",
267267
"docs/standard/data/**/**.md": "gewarren",
268268
"docs/standard/data/sqlite/**/**.md": "bricelam",
269269
"docs/standard/datetime/**/**.md": "Thraka",
@@ -278,7 +278,7 @@
278278
"docs/standard/linq/**/**.md": "billwagner",
279279
"docs/standard/memory-and-spans/**/**.md": "tdykstra",
280280
"docs/standard/native-interop/**/**.md": "jkoritzinsky",
281-
"docs/standard/parallel-programming/**/**.md": "billwagner",
281+
"docs/standard/parallel-programming/**/**.md": "IEvangelist",
282282
"docs/standard/security/**/**.md": "IEvangelist",
283283
"docs/standard/serialization/**/**.md": "tdykstra",
284284
"docs/standard/threading/**/**.md": "billwagner",
@@ -350,7 +350,7 @@
350350
"docs/standard/asynchronous-programming-patterns/**/**.md": "wiwagn",
351351
"docs/standard/attributes/**/**.md": "tdykstra",
352352
"docs/standard/base-types/**/**.md": "adegeo",
353-
"docs/standard/collections/**/**.md": "wiwagn",
353+
"docs/standard/collections/**/**.md": "dapine",
354354
"docs/standard/data/**/**.md": "gewarren",
355355
"docs/standard/data/sqlite/**/**.md": "bricelam",
356356
"docs/standard/datetime/**/**.md": "adegeo",
@@ -365,7 +365,7 @@
365365
"docs/standard/linq/**/**.md": "dotnetcontent",
366366
"docs/standard/memory-and-spans/**/**.md": "tdykstra",
367367
"docs/standard/native-interop/**/**.md": "jekoritz",
368-
"docs/standard/parallel-programming/**/**.md": "wiwagn",
368+
"docs/standard/parallel-programming/**/**.md": "dapine",
369369
"docs/standard/security/**/**.md": "dapine",
370370
"docs/standard/serialization/**/**.md": "tdykstra",
371371
"docs/standard/threading/**/**.md": "wiwagn",

docs/core/deploying/reducing-dependencies.md

Lines changed: 0 additions & 150 deletions
This file was deleted.

docs/core/run-time-config/garbage-collector.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Settings are arranged into groups on this page. The settings within each group a
1818
1919
## Flavors of garbage collection
2020

21-
The two main flavors of garbage collection are workstation GC and server GC. For more information about differences between the two, see [Fundamentals of garbage collection](../../standard/garbage-collection/fundamentals.md#workstation-and-server-garbage-collection).
21+
The two main flavors of garbage collection are workstation GC and server GC. For more information about differences between the two, see [Workstation and server garbage collection](../../standard/garbage-collection/workstation-server-gc.md).
2222

2323
The subflavors of garbage collection are background and non-concurrent.
2424

@@ -66,7 +66,7 @@ Project file:
6666

6767
- Configures whether background (concurrent) garbage collection is enabled.
6868
- Default: Enabled (`true`).
69-
- For more information, see [Background garbage collection](../../standard/garbage-collection/fundamentals.md#background-workstation-garbage-collection) and [Background server garbage collection](../../standard/garbage-collection/fundamentals.md#background-server-garbage-collection).
69+
- For more information, see [Background garbage collection](../../standard/garbage-collection/background-gc.md).
7070

7171
| | Setting name | Values | Version introduced |
7272
| - | - | - | - |
@@ -234,7 +234,7 @@ Example:
234234

235235
- Specifies the maximum commit size, in bytes, for the GC heap and GC bookkeeping.
236236
- This setting only applies to 64-bit computers.
237-
- The default value, which only applies in certain cases, is the lesser of 20 MB or 75% of the memory limit on the container. The default value applies if:
237+
- The default value, which only applies in certain cases, is the greater of 20 MB or 75% of the memory limit on the container. The default value applies if:
238238

239239
- The process is running inside a container that has a specified memory limit.
240240
- [System.GC.HeapHardLimitPercent](#systemgcheaphardlimitpercentcomplus_gcheaphardlimitpercent) is not set.

0 commit comments

Comments
 (0)