Skip to content

Commit 78161e7

Browse files
authored
Merge pull request #3321 from dotnet/master
Update live with current master
2 parents 71cd9c2 + 21b61f2 commit 78161e7

File tree

8 files changed

+40
-12
lines changed

8 files changed

+40
-12
lines changed

xml/System.Diagnostics.Tracing/EventAttribute.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@
369369
You can use standard .NET Framework substitution operators (for example, {1}) in the string). They will be replaced with the string representation of the corresponding part of the event payload.
370370
371371
```csharp
372-
[Event(1, Message = "Application Falure: {0}", Level = EventLevel.Error, Keywords = Keywords.Diagnostic)]
372+
[Event(1, Message = "Application Failure: {0}", Level = EventLevel.Error, Keywords = Keywords.Diagnostic)]
373373
        public void Failure(string message) { WriteEvent(1, message); }
374374
375375
```

xml/System.Net.Http/HttpRequestMessage.xml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,29 @@
461461
</ReturnValue>
462462
<Docs>
463463
<summary>Gets or sets the HTTP message version.</summary>
464-
<value>The HTTP message version. The default in the .NET Framework and earlier versions of .NET Core is 1.1. In .NET Core 2.1 and later, it is 2.0.</value>
465-
<remarks>Starting with .NET Core 2.1, the default value of the `Version` property changed from 1.1 to 2.0.</remarks>
464+
<value>The HTTP message version. The default value is <c>1.1</c>, unless you're targeting .NET Core 2.1 or 2.2. In that case, the default value is <c>2.0</c>.</value>
465+
<remarks>
466+
<format type="text/markdown"><![CDATA[
467+
468+
## Remarks
469+
470+
In .NET Core, the default message version differs based on the version you're using. .NET Core 2.1 changed the default value from `1.1` to `2.0`. In .NET Core 3.0, the default value was reverted back to `1.1`.
471+
472+
### .NET Framework
473+
474+
The default message version is `1.1`.
475+
476+
### .NET Core
477+
478+
The following table lists the default message version based on the version of .NET Core:
479+
480+
| .NET Core version | HTTP request version |
481+
| --------------------------- | -------------------- |
482+
| 2.1<br/>2.2 | `2.0` |
483+
| Any other .NET Core version | `1.1` |
484+
485+
]]></format>
486+
</remarks>
466487
</Docs>
467488
</Member>
468489
</Members>

xml/System.Reflection.Metadata.Ecma335/SignatureDecoder`2.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
<typeparam name="TGenericContext">To be added.</typeparam>
3030
<summary>Decodes signature blobs.</summary>
3131
<remarks>
32-
<format type="text/markdown">
33-
<![CDATA[
32+
<format type="text/markdown"><![CDATA[
3433
3534
## Remarks
3635

xml/System.Runtime.InteropServices/SEHException.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ catch(…)
9292
</remarks>
9393
<altmember cref="T:System.Exception" />
9494
<related type="Article" href="~/docs/standard/exceptions/index.md">Handling and throwing exceptions in .NET</related>
95-
<related type="Article" href="https://msdn.microsoft.com/library/610b364b-2761-429d-9c4a-afbc3e66f1b9">How to: Map HRESULTs and Exceptions</related>
95+
<related type="Article" href="~/docs/framework/interop/how-to-map-hresults-and-exceptions.md">How to: Map HRESULTs and Exceptions</related>
9696
</Docs>
9797
<Members>
9898
<MemberGroup MemberName=".ctor">

xml/System.Runtime.Serialization.Json/DataContractJsonSerializer.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@
4040
<remarks>
4141
<format type="text/markdown"><![CDATA[
4242
43-
## Remarks
44-
Use the <xref:System.Runtime.Serialization.Json.DataContractJsonSerializer> class to serialize instances of a type into a JSON document and to deserialize a JSON document into an instance of a type. For example, you can create a type named `Person` with properties that contain essential data, such as a name and address. You can then create and manipulate an instance of the `Person` class and write all of its property values in a JSON document for later retrieval. This JSON document can later be deserialized into the `Person` class or another class with an equivalent data contract.
43+
## Remarks
44+
For most scenarios that involve serializing to JSON and deserializing from JSON, we recommend the [tools in the System.Text.Json namespace](/dotnet/standard/serialization/system-text-json-overview).
45+
46+
If your scenario requires the <xref:System.Runtime.Serialization.Json.DataContractJsonSerializer> class, you can use it to serialize instances of a type into a JSON document and to deserialize a JSON document into an instance of a type. For example, you can create a type named `Person` with properties that contain essential data, such as a name and address. You can then create and manipulate an instance of the `Person` class and write all of its property values in a JSON document for later retrieval. This JSON document can later be deserialized into the `Person` class or another class with an equivalent data contract.
4547
4648
If an error occurs during the serialization of an outgoing reply on the server or the reply operation throws an exception for some other reason, it may not get returned to the client as a fault.
4749

xml/System.Threading/ThreadLocal`1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@
524524
<format type="text/markdown"><![CDATA[
525525
526526
## Remarks
527-
If this instance was not previously initialized for the current thread, accessing <xref:System.Threading.ThreadLocal%601.Value%2A> will attempt to initialize it. If an initialization function was supplied during the construction, that initialization will happen by invoking the function to retrieve the initial value for <xref:System.Threading.ThreadLocal%601.Value%2A>. Otherwise, the default value of will be used. If an exception is thrown, that exception is cached and thrown on each subsequent access of the property.
527+
If this instance was not previously initialized for the current thread, accessing <xref:System.Threading.ThreadLocal%601.Value%2A> will attempt to initialize it. If an initialization function was supplied during the construction, that initialization will happen by invoking the function to retrieve the initial value for <xref:System.Threading.ThreadLocal%601.Value%2A>. Otherwise, the default value of `T` will be used.
528528
529529
]]></format>
530530
</remarks>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Namespace Name="Microsoft.VisualC.StlClr.Generic">
22
<Docs>
3-
<summary>Contains the classes, interfaces, and iterators that are used to implement the generic interface to the . By using this generic interface, other .NET languages, such as C# and Visual Basic, can call code that is written using STL/CLR.</summary>
3+
<summary>Contains the classes, interfaces, and iterators that are used to implement the generic interface to the <see href="https://docs.microsoft.com/cpp/dotnet/stl-clr-library-reference">STL/CLR Library</see>. By using this generic interface, other .NET languages, such as C# and Visual Basic, can call code that is written using STL/CLR.</summary>
44
<remarks>To be added.</remarks>
55
</Docs>
6-
</Namespace>
6+
</Namespace>

xml/ns-System.Text.Json.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<Namespace Name="System.Text.Json">
22
<Docs>
33
<summary>The System.Text.Json namespace provides high-performance, low-allocating, and standards-compliant capabilities to process JavaScript Object Notation (JSON), which includes serializing objects to JSON text and deserializing JSON text to objects, with UTF-8 support built-in. It also provides types to read and write JSON text encoded as UTF-8, and to create an in-memory document object model (DOM) for random access of the JSON elements within a structured view of the data.</summary>
4-
<remarks>To be added.</remarks>
4+
<remarks>
5+
<format type="text/markdown"><![CDATA[
6+
## Remarks
7+
8+
For more information, see the [System.Text.Json overview](/dotnet/standard/serialization/system-text-json-overview).
9+
]]></format>
10+
</remarks>
511
</Docs>
612
</Namespace>

0 commit comments

Comments
 (0)