Skip to content

Commit 348bb05

Browse files
authored
Merge pull request #18002 from dotnet/publish-23474
Merge master into live
2 parents 4655478 + 047f3d8 commit 348bb05

32 files changed

+69
-51
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@
121121

122122
################## .NET STANDARD ##################
123123
# Analyzers
124-
/docs/standard/analyzers/ @gewarren
124+
/docs/standard/analyzers/ @IEvangelist
125125
# Assembly
126-
/docs/standard/assembly/ @gewarren
126+
/docs/standard/assembly/ @IEvangelist
127127
# Asynchronous Programming Patterns
128128
/docs/standard/asynchronous-programming-patterns/ @BillWagner
129129
# Attributes
@@ -141,7 +141,7 @@
141141
# Design guidelines
142142
/docs/standard/design-guidelines/ @BillWagner
143143
# Events
144-
/docs/standard/events/ @gewarren
144+
/docs/standard/events/ @IEvangelist
145145
# Exceptions
146146
/docs/standard/exceptions/ @tdykstra
147147
# GC
@@ -163,7 +163,7 @@
163163
# Parallel programming
164164
/docs/standard/parallel-programming/ @BillWagner
165165
# Security
166-
/docs/standard/security/ @gewarren
166+
/docs/standard/security/ @IEvangelist
167167
# Serialization
168168
/docs/standard/serialization/ @tdykstra
169169
# Threading

.github/ISSUE_TEMPLATE/dotnet-breaking-change.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Also, remove this comment before submitting the issue.
4343
- ASP.NET Core
4444
- C#
4545
- Core
46-
- CoreFx
46+
- Core .NET libraries
4747
- Data
4848
- Debugger
4949
- Deployment for .NET Core

docfx.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@
258258
"docs/machine-learning/**/**.md": "natke",
259259
"docs/spark/**/**.md": "mamccrea",
260260
"docs/standard/**/**.md": "gewarren",
261-
"docs/standard/analyzers/**/**.md": "gewarren",
262-
"docs/standard/assembly/**/**.md": "gewarren",
261+
"docs/standard/analyzers/**/**.md": "IEvangelist",
262+
"docs/standard/assembly/**/**.md": "IEvangelist",
263263
"docs/standard/asynchronous-programming-patterns/**/**.md": "billwagner",
264264
"docs/standard/attributes/**/**.md": "tdykstra",
265265
"docs/standard/base-types/**/**.md": "Thraka",
@@ -268,7 +268,7 @@
268268
"docs/standard/data/sqlite/**/**.md": "bricelam",
269269
"docs/standard/datetime/**/**.md": "Thraka",
270270
"docs/standard/design-guidelines/**/**.md": "KrzysztofCwalina",
271-
"docs/standard/events/**/**.md": "gewarren",
271+
"docs/standard/events/**/**.md": "IEvangelist",
272272
"docs/standard/exceptions/**/**.md": "tdykstra",
273273
"docs/standard/garbage-collection/**/**.md": "gewarren",
274274
"docs/standard/generics/**/**.md": "Thraka",
@@ -279,7 +279,7 @@
279279
"docs/standard/memory-and-spans/**/**.md": "tdykstra",
280280
"docs/standard/native-interop/**/**.md": "jkoritzinsky",
281281
"docs/standard/parallel-programming/**/**.md": "billwagner",
282-
"docs/standard/security/**/**.md": "gewarren",
282+
"docs/standard/security/**/**.md": "IEvangelist",
283283
"docs/standard/serialization/**/**.md": "tdykstra",
284284
"docs/standard/threading/**/**.md": "billwagner",
285285
"docs/standard/whats-new/**/**.md": "gewarren",
@@ -345,8 +345,8 @@
345345
"docs/machine-learning/**/**.md": "nakersha",
346346
"docs/spark/**/**.md": "mamccrea",
347347
"docs/standard/**/**.md": "gewarren",
348-
"docs/standard/analyzers/**/**.md": "gewarren",
349-
"docs/standard/assembly/**/**.md": "gewarren",
348+
"docs/standard/analyzers/**/**.md": "dapine",
349+
"docs/standard/assembly/**/**.md": "dapine",
350350
"docs/standard/asynchronous-programming-patterns/**/**.md": "wiwagn",
351351
"docs/standard/attributes/**/**.md": "tdykstra",
352352
"docs/standard/base-types/**/**.md": "adegeo",
@@ -355,7 +355,7 @@
355355
"docs/standard/data/sqlite/**/**.md": "bricelam",
356356
"docs/standard/datetime/**/**.md": "adegeo",
357357
"docs/standard/design-guidelines/**/**.md": "kcwalina",
358-
"docs/standard/events/**/**.md": "gewarren",
358+
"docs/standard/events/**/**.md": "dapine",
359359
"docs/standard/exceptions/**/**.md": "tdykstra",
360360
"docs/standard/garbage-collection/**/**.md": "gewarren",
361361
"docs/standard/generics/**/**.md": "adegeo",
@@ -366,7 +366,7 @@
366366
"docs/standard/memory-and-spans/**/**.md": "tdykstra",
367367
"docs/standard/native-interop/**/**.md": "jekoritz",
368368
"docs/standard/parallel-programming/**/**.md": "wiwagn",
369-
"docs/standard/security/**/**.md": "gewarren",
369+
"docs/standard/security/**/**.md": "dapine",
370370
"docs/standard/serialization/**/**.md": "tdykstra",
371371
"docs/standard/threading/**/**.md": "wiwagn",
372372
"docs/standard/whats-new/**/**.md": "dotnetcontent",

docs/core/compatibility/2.0-2.1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.date: 12/17/2019
77

88
If you're migrating from version 2.0 to version 2.1 of .NET Core, the breaking changes listed in this article may affect your app.
99

10-
## CoreFx
10+
## Core .NET libraries
1111

1212
- [Private fields added to built-in struct types](#private-fields-added-to-built-in-struct-types)
1313
- [OpenSSL versions on macOS](#openssl-versions-on-macos)

docs/core/compatibility/2.2-3.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ If you're migrating from version 2.2 to version 3.0 of .NET Core, ASP.NET Core,
260260

261261
***
262262

263-
## CoreFx
263+
## Core .NET libraries
264264

265265
- [APIs that report version now report product and not file version](#apis-that-report-version-now-report-product-and-not-file-version)
266266
- [Custom EncoderFallbackBuffer instances cannot fall back recursively](#custom-encoderfallbackbuffer-instances-cannot-fall-back-recursively)

docs/core/compatibility/2.2-3.1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ If you're migrating from version 2.2 to version 3.1 of .NET Core, ASP.NET Core,
263263

264264
[!INCLUDE[Target framework: .NET Framework not supported](~/includes/core-changes/aspnetcore/3.0/targetfx-netfx-tfm-support.md)]
265265

266-
## CoreFx
266+
## Core .NET libraries
267267

268268
- [APIs that report version now report product and not file version](#apis-that-report-version-now-report-product-and-not-file-version)
269269
- [Custom EncoderFallbackBuffer instances cannot fall back recursively](#custom-encoderfallbackbuffer-instances-cannot-fall-back-recursively)

docs/core/compatibility/corefx.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Base class library breaking changes
3-
description: Lists the breaking changes in .NET CoreFx, the base class library.
4-
ms.date: "09/20/2019"
3+
description: Lists the breaking changes in core .NET libraries.
4+
ms.date: 09/20/2019
55
---
6-
# CoreFx breaking changes
6+
# Core .NET libraries breaking changes
77

8-
CoreFx provides the primitives and other general types used by .NET Core.
8+
The core .NET libraries provide the primitives and other general types used by .NET Core.
99

1010
The following breaking changes are documented on this page:
1111

docs/core/compatibility/fx-core.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ If you're migrating an app from .NET Framework to .NET Core, the breaking change
1111
> [!NOTE]
1212
> This article is not a complete list of breaking changes between .NET Framework and .NET Core. The most important breaking changes are added here as we become aware of them.
1313
14-
## CoreFx
14+
## Core .NET libraries
1515

1616
- [Change in default value of UseShellExecute](#change-in-default-value-of-useshellexecute)
1717
- [UnauthorizedAccessException thrown by FileSystemInfo.Attributes](#unauthorizedaccessexception-thrown-by-filesysteminfoattributes)

docs/core/compatibility/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
items:
3131
- name: ASP.NET Core
3232
href: aspnetcore.md
33-
- name: CoreFx
33+
- name: Core .NET libraries
3434
href: corefx.md
3535
- name: Cryptography
3636
href: cryptography.md

docs/core/diagnostics/debug-memory-leak.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Debug a memory leak tutorial
33
description: Learn how to debug a memory leak in .NET Core.
44
ms.topic: tutorial
5-
ms.date: 12/17/2019
5+
ms.date: 04/20/2020
66
---
77
# Tutorial: Debug a memory leak in .NET Core
88

@@ -131,7 +131,7 @@ In this tutorial, you're now done with the [Sample debug target](https://docs.mi
131131

132132
### Analyze the core dump
133133

134-
Now that you have a core dump generated, use the [dotnet-dump)](dotnet-dump.md) tool to analyze the dump:
134+
Now that you have a core dump generated, use the [dotnet-dump](dotnet-dump.md) tool to analyze the dump:
135135

136136
```dotnetcli
137137
dotnet-dump analyze core_20190430_185145

0 commit comments

Comments
 (0)