Skip to content

Commit 39b1d5f

Browse files
cxwtoolgewarrenTheSenchYoussef1313IEvangelist
authored
Merge master into live (#21095)
* Respond to feedback for deserialization constructors (#21051) * Fixes #20949. (#21052) * Add f1-keyword for `class` used as generic type constraint (#21037) * Add f1-keyword for `class` used as generic type constraint * Add structconstraint * Update CS0267 message and simplify example (#21047) * Update CS0267 message and simplify example * Update ms.date * Added a link (#21058) * Fixes #20958. (#21054) * fix the source path for retired C# 7.x content (#21059) The "whats-new" folder was missing. * Removing redundant pipe character (#20931) * Update single-file.md (#20925) update ReadyToRun link now that we have the docs for it. * Remove statement about TLS 1.3 for .NET Core 3.0 (#20922) I think, TLS 1.3 won't be supported by .NET Core 3.0 since it's out of support and the implementation is coming with .NET 5, as stated in [Transport Layer Security (TLS) best practices with the .NET Framework](#4675 (comment)). This info should be removed, so we have no misleading information out there... 😉 * SslStream/NegotiateStream breaking change (#20979) * Add workload and app model to glossary (#21046) Co-authored-by: Genevieve Warren <[email protected]> * Breaking change for key-value pair serialization (#21050) * Update .NET Standard overview for .NET 5 (#20955) Co-authored-by: Genevieve Warren <[email protected]> * Update get-started-vscode.md (#21072) http to https after verifying link Co-authored-by: Genevieve Warren <[email protected]> Co-authored-by: Jon Senchyna <[email protected]> Co-authored-by: Youssef Victor <[email protected]> Co-authored-by: David Pine <[email protected]> Co-authored-by: Bill Wagner <[email protected]> Co-authored-by: William Whitwell Bailey <[email protected]> Co-authored-by: Lakshan Fernando <[email protected]> Co-authored-by: kapsiR <[email protected]> Co-authored-by: Tom Dykstra <[email protected]> Co-authored-by: icyfire0573 <[email protected]>
1 parent e078b75 commit 39b1d5f

23 files changed

+435
-169
lines changed

.openpublishing.redirection.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2615,15 +2615,15 @@
26152615
"redirect_url": "/dotnet/csharp/programming-guide/types/index"
26162616
},
26172617
{
2618-
"source_path": "docs/csharp/csharp-7-1.md",
2618+
"source_path": "docs/csharp/whats-new/csharp-7-1.md",
26192619
"redirect_url": "/dotnet/csharp/whats-new/csharp-7"
26202620
},
26212621
{
2622-
"source_path": "docs/csharp/csharp-7-2.md",
2622+
"source_path": "docs/csharp/whats-new/csharp-7-2.md",
26232623
"redirect_url": "/dotnet/csharp/whats-new/csharp-7"
26242624
},
26252625
{
2626-
"source_path": "docs/csharp/csharp-7-3.md",
2626+
"source_path": "docs/csharp/whats-new/csharp-7-3.md",
26272627
"redirect_url": "/dotnet/csharp/whats-new/csharp-7"
26282628
},
26292629
{

docs/core/compatibility/3.1-5.0.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ If you're migrating from version 3.1 of .NET Core, ASP.NET Core, or EF Core to v
205205

206206
## Core .NET libraries
207207

208+
- [FrameworkDescription's value is .NET instead of .NET Core](#frameworkdescriptions-value-is-net-instead-of-net-core)
208209
- [Assembly-related API behavior changes for single-file publishing format](#assembly-related-api-behavior-changes-for-single-file-publishing-format)
209210
- [Order of tags in Activity.Tags is reversed](#order-of-tags-in-activitytags-is-reversed)
210211
- [Thread.Abort is obsolete](#threadabort-is-obsolete)
@@ -226,6 +227,10 @@ If you're migrating from version 3.1 of .NET Core, ASP.NET Core, or EF Core to v
226227
- [CounterSet.CreateCounterSetInstance now throws InvalidOperationException if instance already exist](#countersetcreatecountersetinstance-now-throws-invalidoperationexception-if-instance-already-exists)
227228
- [Microsoft.DotNet.PlatformAbstractions package removed](#microsoftdotnetplatformabstractions-package-removed)
228229

230+
[!INCLUDE [frameworkdescription-returns-net-not-net-core](../../../includes/core-changes/corefx/5.0/frameworkdescription-returns-net-not-net-core.md)]
231+
232+
***
233+
229234
[!INCLUDE [assembly-api-behavior-changes-for-single-file-publish](../../../includes/core-changes/corefx/5.0/assembly-api-behavior-changes-for-single-file-publish.md)]
230235

231236
***
@@ -375,10 +380,20 @@ If you're migrating from version 3.1 of .NET Core, ASP.NET Core, or EF Core to v
375380

376381
## Networking
377382

383+
- [NegotiateStream and SslStream allow successive Begin operations](#negotiatestream-and-sslstream-allow-successive-begin-operations)
384+
- [Socket.LocalEndPoint is updated after calling SendToAsync](#socketlocalendpoint-is-updated-after-calling-sendtoasync)
378385
- [WinHttpHandler removed from .NET runtime](#winhttphandler-removed-from-net-runtime)
379386
- [MulticastOption.Group doesn't accept a null value](#multicastoptiongroup-doesnt-accept-a-null-value)
380387
- [Cookie Path handling now conforms to RFC 6265](#cookie-path-handling-now-conforms-to-rfc-6265)
381388

389+
[!INCLUDE [negotiatestream-sslstream-dont-fail-on-successive-begin-calls](../../../includes/core-changes/networking/5.0/negotiatestream-sslstream-dont-fail-on-successive-begin-calls.md)]
390+
391+
***
392+
393+
[!INCLUDE [localendpoint-updated-on-sendtoasync](../../../includes/core-changes/networking/5.0/localendpoint-updated-on-sendtoasync.md)]
394+
395+
***
396+
382397
[!INCLUDE [winhttphandler-removed-from-runtime](../../../includes/core-changes/networking/5.0/winhttphandler-removed-from-runtime.md)]
383398

384399
***
@@ -393,11 +408,16 @@ If you're migrating from version 3.1 of .NET Core, ASP.NET Core, or EF Core to v
393408

394409
## Serialization
395410

411+
- [PropertyNamingPolicy, PropertyNameCaseInsensitive, and Encoder options are honored when serializing and deserializing key-value pairs](#propertynamingpolicy-propertynamecaseinsensitive-and-encoder-options-are-honored-when-serializing-and-deserializing-key-value-pairs)
396412
- [Non-public, parameterless constructors not used for deserialization](#non-public-parameterless-constructors-not-used-for-deserialization)
397413
- [JsonSerializer.Serialize throws ArgumentNullException when type parameter is null](#jsonserializerserialize-throws-argumentnullexception-when-type-parameter-is-null)
398414
- [JsonSerializer.Deserialize requires single-character string](#jsonserializerdeserialize-requires-single-character-string)
399415
- [BinaryFormatter.Deserialize rewraps some exceptions in SerializationException](#binaryformatterdeserialize-rewraps-some-exceptions-in-serializationexception)
400416

417+
[!INCLUDE [options-honored-when-serializing-key-value-pairs](../../../includes/core-changes/serialization/5.0/options-honored-when-serializing-key-value-pairs.md)]
418+
419+
***
420+
401421
[!INCLUDE [non-public-parameterless-constructors-not-used-for-deserialization](../../../includes/core-changes/serialization/5.0/non-public-parameterless-constructors-not-used-for-deserialization.md)]
402422

403423
***

docs/core/compatibility/corefx.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ The following breaking changes are documented on this page:
1111

1212
| Breaking change | Version introduced |
1313
| - | :-: |
14+
| [FrameworkDescription's value is .NET instead of .NET Core](#frameworkdescriptions-value-is-net-instead-of-net-core) | 5.0 |
1415
| [Assembly-related API behavior changes for single-file publishing format](#assembly-related-api-behavior-changes-for-single-file-publishing-format) | 5.0 |
1516
| [Order of tags in Activity.Tags is reversed](#order-of-tags-in-activitytags-is-reversed) | 5.0 |
1617
| [Parameter names changed in RC1](#parameter-names-changed-in-rc1) | 5.0 |
@@ -52,6 +53,10 @@ The following breaking changes are documented on this page:
5253

5354
## .NET 5.0
5455

56+
[!INCLUDE [frameworkdescription-returns-net-not-net-core](../../../includes/core-changes/corefx/5.0/frameworkdescription-returns-net-not-net-core.md)]
57+
58+
***
59+
5560
[!INCLUDE [assembly-api-behavior-changes-for-single-file-publish](../../../includes/core-changes/corefx/5.0/assembly-api-behavior-changes-for-single-file-publish.md)]
5661

5762
***

docs/core/compatibility/networking.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ The following breaking changes are documented on this page:
99

1010
| Breaking change | Introduced version |
1111
| - | - |
12+
| [NegotiateStream and SslStream allow successive Begin operations](#negotiatestream-and-sslstream-allow-successive-begin-operations) | 5.0 |
13+
| [Socket.LocalEndPoint is updated after calling SendToAsync](#socketlocalendpoint-is-updated-after-calling-sendtoasync) | 5.0 |
1214
| [WinHttpHandler removed from .NET runtime](#winhttphandler-removed-from-net-runtime) | 5.0 |
1315
| [MulticastOption.Group doesn't accept a null value](#multicastoptiongroup-doesnt-accept-a-null-value) | 5.0 |
1416
| [Cookie Path handling now conforms to RFC 6265](#cookie-path-handling-now-conforms-to-rfc-6265) | 5.0 |
@@ -17,6 +19,14 @@ The following breaking changes are documented on this page:
1719

1820
## .NET 5.0
1921

22+
[!INCLUDE [negotiatestream-sslstream-dont-fail-on-successive-begin-calls](../../../includes/core-changes/networking/5.0/negotiatestream-sslstream-dont-fail-on-successive-begin-calls.md)]
23+
24+
***
25+
26+
[!INCLUDE [localendpoint-updated-on-sendtoasync](../../../includes/core-changes/networking/5.0/localendpoint-updated-on-sendtoasync.md)]
27+
28+
***
29+
2030
[!INCLUDE [winhttphandler-removed-from-runtime](../../../includes/core-changes/networking/5.0/winhttphandler-removed-from-runtime.md)]
2131

2232
***

docs/core/compatibility/serialization.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,18 @@ The following breaking changes are documented on this page:
99

1010
| Breaking change | Introduced version |
1111
| - | - |
12+
| [PropertyNamingPolicy, PropertyNameCaseInsensitive, and Encoder options are honored when serializing and deserializing key-value pairs](#propertynamingpolicy-propertynamecaseinsensitive-and-encoder-options-are-honored-when-serializing-and-deserializing-key-value-pairs) | 5.0 |
1213
| [Non-public, parameterless constructors not used for deserialization](#non-public-parameterless-constructors-not-used-for-deserialization) | 5.0 |
1314
| [JsonSerializer.Serialize throws ArgumentNullException when type parameter is null](#jsonserializerserialize-throws-argumentnullexception-when-type-parameter-is-null) | 5.0 |
1415
| [JsonSerializer.Deserialize requires single-character string](#jsonserializerdeserialize-requires-single-character-string) | 5.0 |
1516
| [BinaryFormatter.Deserialize rewraps some exceptions in SerializationException](#binaryformatterdeserialize-rewraps-some-exceptions-in-serializationexception) | 5.0 |
1617

1718
## .NET 5.0
1819

20+
[!INCLUDE [options-honored-when-serializing-key-value-pairs](../../../includes/core-changes/serialization/5.0/options-honored-when-serializing-key-value-pairs.md)]
21+
22+
***
23+
1924
[!INCLUDE [non-public-parameterless-constructors-not-used-for-deserialization](../../../includes/core-changes/serialization/5.0/non-public-parameterless-constructors-not-used-for-deserialization.md)]
2025

2126
***

docs/core/deploying/single-file.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 08/28/2020
99

1010
Bundling all application-dependent files into a single binary provides an application developer with the attractive option to deploy and distribute the application as a single file. This deployment model has been available since .NET Core 3.0 and has been enhanced in .NET 5.0. Previously in .NET Core 3.0, when a user runs your single-file app, .NET Core host first extracts all files to a temporary directory before running the application. .NET 5.0 improves this experience by directly running the code without the need to extract the files from the app.
1111

12-
Single File deployment is available for both the [framework-dependent deployment model](index.md#publish-framework-dependent) and [self-contained applications](index.md#publish-self-contained). The size of the single file in a self-contained application will be large since it will include the runtime and the framework libraries. The single file deployment option can be combined with [ReadyToRun](../tools/dotnet-publish.md) and [Trim (an experimental feature in .NET 5.0)](trim-self-contained.md) publish options.
12+
Single File deployment is available for both the [framework-dependent deployment model](index.md#publish-framework-dependent) and [self-contained applications](index.md#publish-self-contained). The size of the single file in a self-contained application will be large since it will include the runtime and the framework libraries. The single file deployment option can be combined with [ReadyToRun](ready-to-run.md) and [Trim (an experimental feature in .NET 5.0)](trim-self-contained.md) publish options.
1313

1414
## API incompatibility
1515

docs/core/dotnet-five.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: What's new in .NET 5
33
description: Learn about .NET 5, a cross platform and open-source development platform that is the next evolution of .NET Core.
4-
ms.date: 09/02/2020
4+
ms.date: 10/13/2020
55
ms.topic: overview
66
ms.author: dapine
77
author: IEvangelist
@@ -33,7 +33,7 @@ The advent of .NET Core has evolved the .NET ecosystem in compelling ways. It ma
3333
- [System.Text.RegularExpressions](https://devblogs.microsoft.com/dotnet/regex-performance-improvements-in-net-5)
3434
- [Async ValueTask pooling](https://devblogs.microsoft.com/dotnet/async-valuetask-pooling-in-net-5)
3535
- [Many more areas](https://devblogs.microsoft.com/dotnet/performance-improvements-in-net-5)
36-
- Container size optimizations
36+
- [Container size optimizations](https://github.com/dotnet/dotnet-docker/issues/1814#issuecomment-625294750)
3737
- [App trimming](https://devblogs.microsoft.com/dotnet/app-trimming-in-net-5)
3838
- [C# compiler enhancements](https://devblogs.microsoft.com/dotnet/automatically-find-latent-bugs-in-your-code-with-net-5)
3939
- Tooling support for dump debugging

docs/core/whats-new/dotnet-core-3-0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ The GPIO packages include APIs for *GPIO*, *SPI*, *I2C*, and *PWM* devices. The
390390
When available, .NET Core 3.0 uses **OpenSSL 1.1.1**, **OpenSSL 1.1.0**, or **OpenSSL 1.0.2** on a Linux system. When **OpenSSL 1.1.1** is available, both <xref:System.Net.Security.SslStream?displayProperty=nameWithType> and <xref:System.Net.Http.HttpClient?displayProperty=nameWithType> types will use **TLS 1.3** (assuming both the client and server support **TLS 1.3**).
391391

392392
> [!IMPORTANT]
393-
> Windows and macOS do not yet support **TLS 1.3**. .NET Core 3.0 will support **TLS 1.3** on these operating systems when support becomes available.
393+
> Windows and macOS do not yet support **TLS 1.3**.
394394
395395
The following C# 8.0 example demonstrates .NET Core 3.0 on Ubuntu 18.10 connecting to <https://www.cloudflare.com>:
396396

docs/csharp/language-reference/keywords/where-generic-type-constraint.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ ms.date: 04/15/2020
66
f1_keywords:
77
- "whereconstraint"
88
- "whereconstraint_CSharpKeyword"
9+
- "classconstraint_CSharpKeyword"
10+
- "structconstraint_CSharpKeyword"
911
helpviewer_keywords:
1012
- "where (generic type constraint) [C#]"
1113
---

docs/csharp/misc/cs0267.md

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
description: "Compiler Error CS0267"
33
title: "Compiler Error CS0267"
4-
ms.date: 07/20/2015
4+
ms.date: 10/12/2020
55
f1_keywords:
66
- "CS0267"
77
helpviewer_keywords:
@@ -10,31 +10,20 @@ ms.assetid: 11aaab96-5838-4e36-9551-5b032a1089e1
1010
---
1111
# Compiler Error CS0267
1212

13-
The partial modifier can only appear immediately before 'class', 'struct', or 'interface'
14-
15-
The placement of the **partial** modifier was incorrect in the declaration of the class, struct or interface. To fix the error, reorder the modifiers. For more information, see [Partial Classes and Methods](../programming-guide/classes-and-structs/partial-classes-and-methods.md).
16-
17-
The following sample generates CS0267:
18-
19-
```csharp
20-
// CS0267.cs
21-
public partial class MyClass
22-
{
23-
public MyClass()
24-
{
25-
}
26-
}
27-
28-
partial public class MyClass // CS0267
29-
// Try this line instead:
30-
// public partial class MyClass
31-
{
32-
public void Foo()
33-
{
34-
}
35-
36-
public static void Main()
37-
{
38-
}
39-
}
13+
The partial modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
14+
15+
The placement of the **partial** modifier was incorrect in the declaration of the class, record, struct, interface, or method. To fix the error, reorder the modifiers. For more information, see [Partial Classes and Methods](../programming-guide/classes-and-structs/partial-classes-and-methods.md).
16+
17+
The following sample generates CS0267:
18+
19+
```csharp
20+
public partial class MyClass
21+
{
22+
}
23+
24+
partial public class MyClass // CS0267
25+
// Try this line instead:
26+
// public partial class MyClass
27+
{
28+
}
4029
```

0 commit comments

Comments
 (0)