Skip to content

Commit 2b0967e

Browse files
BillWagnerBillWagner
authored
Merge pull request #3507 from dotnet/master
Update live with current master
2 parents 7b7071f + e9a7b16 commit 2b0967e

File tree

133 files changed

+966
-1107
lines changed

Some content is hidden

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

133 files changed

+966
-1107
lines changed

‎_zip/missingapi.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
### YamlMime:XRefMap
22
hrefUpdated: true
33
references:
4+
- uid: System.Diagnostics.PresentationTraceSources.TraceLevel
5+
name: PresentationTraceSources.TraceLevel
6+
fullname: System.Diagnostics.PresentationTraceSources.TraceLevel
7+
href: https://docs.microsoft.com/previous-versions/bb778381(v=vs.110)
48
- uid: System.MonoNotSupportedAttribute
59
name: MonoNotSupportedAttribute
610
fullname: System.MonoNotSupportedAttribute

‎includes/tlasharptla-wpfxmlnsv1-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎xml/Microsoft.Extensions.DependencyInjection/HttpClientBuilderExtensions.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<returns>An <see cref="T:Microsoft.Extensions.DependencyInjection.IHttpClientBuilder" /> that can be used to configure the client.</returns>
4949
<remarks>
5050
<para>
51-
The <see paramref="configureHandler" /> delegate should return a new instance of the message handler each time it
51+
The <paramref name="configureHandler" /> delegate should return a new instance of the message handler each time it
5252
is invoked.
5353
</para>
5454
<para>
@@ -84,7 +84,7 @@
8484
<param name="configureHandler">A delegate that is used to create a <see cref="T:System.Net.Http.DelegatingHandler" />.</param>
8585
<summary>Adds a delegate that will be used to create an additional message handler for a named <see cref="T:System.Net.Http.HttpClient" />.</summary>
8686
<returns>An <see cref="T:Microsoft.Extensions.DependencyInjection.IHttpClientBuilder" /> that can be used to configure the client.</returns>
87-
<remarks>The <see paramref="configureHandler" /> delegate should return a new instance of the message handler each time it
87+
<remarks>The <paramref name="configureHandler" /> delegate should return a new instance of the message handler each time it
8888
is invoked.</remarks>
8989
</Docs>
9090
</Member>
@@ -470,7 +470,7 @@
470470
<returns>An <see cref="T:Microsoft.Extensions.DependencyInjection.IHttpClientBuilder" /> that can be used to configure the client.</returns>
471471
<remarks>
472472
<para>
473-
The <see paramref="configureHandler" /> delegate should return a new instance of the message handler each time it
473+
The <paramref name="configureHandler" /> delegate should return a new instance of the message handler each time it
474474
is invoked.
475475
</para>
476476
<para>
@@ -507,7 +507,7 @@
507507
<summary>Adds a delegate that will be used to configure the primary <see cref="T:System.Net.Http.HttpMessageHandler" /> for a
508508
named <see cref="T:System.Net.Http.HttpClient" />.</summary>
509509
<returns>An <see cref="T:Microsoft.Extensions.DependencyInjection.IHttpClientBuilder" /> that can be used to configure the client.</returns>
510-
<remarks>The <see paramref="configureHandler" /> delegate should return a new instance of the message handler each time it
510+
<remarks>The <paramref name="configureHandler" /> delegate should return a new instance of the message handler each time it
511511
is invoked.</remarks>
512512
</Docs>
513513
</Member>

‎xml/Microsoft.Extensions.Logging.EventSource/LoggingEventSource.xml

Lines changed: 73 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -19,70 +19,79 @@
1919
</Attribute>
2020
</Attributes>
2121
<Docs>
22-
<summary>
23-
The LoggingEventSource is the bridge from all ILogger based logging to EventSource/EventListener logging.
24-
25-
You turn this logging on by enabling the EventSource called
26-
27-
Microsoft-Extensions-Logging
28-
29-
When you enabled the EventSource, the EventLevel you set is translated in the obvious way to the level
30-
associated with the ILogger (thus Debug = verbose, Informational = Informational ... Critical == Critical)
31-
32-
This allows you to filter by event level in a straightforward way.
33-
34-
For finer control you can specify a EventSource Argument called
35-
36-
FilterSpecs
37-
38-
The FilterSpecs argument is a semicolon separated list of specifications. Where each specification is
39-
40-
SPEC = // empty spec, same as *
41-
| NAME // Just a name the level is the default level
42-
| NAME : LEVEL // specifies level for a particular logger (can have a * suffix).
43-
44-
Where Name is the name of a ILoggger (case matters), Name can have a * which acts as a wildcard
45-
AS A SUFFIX. Thus Net* will match any loggers that start with the 'Net'.
46-
47-
The LEVEL is a number or a LogLevel string. 0=Trace, 1=Debug, 2=Information, 3=Warning, 4=Error, Critical=5
48-
This specifies the level for the associated pattern. If the number is not specified, (first form
49-
of the specification) it is the default level for the EventSource.
50-
51-
First match is used if a particular name matches more than one pattern.
52-
53-
In addition the level and FilterSpec argument, you can also set EventSource Keywords. See the Keywords
54-
definition below, but basically you get to decide if you wish to have
55-
56-
* Keywords.Message - You get the event with the data in parsed form.
57-
* Keywords.JsonMessage - you get an event with the data in parse form but as a JSON blob (not broken up by argument ...)
58-
* Keywords.FormattedMessage - you get an event with the data formatted as a string
59-
60-
It is expected that you will turn only one of these keywords on at a time, but you can turn them all on (and get
61-
the same data logged three different ways.
62-
63-
Example Usage
64-
65-
This example shows how to use an EventListener to get ILogging information
66-
67-
class MyEventListener : EventListener {
68-
protected override void OnEventSourceCreated(EventSource eventSource) {
69-
if (eventSource.Name == "Microsoft-Extensions-Logging") {
70-
// initialize a string, string dictionary of arguments to pass to the EventSource.
71-
// Turn on loggers matching App* to Information, everything else (*) is the default level (which is EventLevel.Error)
72-
var args = new Dictionary&lt;string, string&gt;() { { "FilterSpecs", "App*:Information;*" } };
73-
// Set the default level (verbosity) to Error, and only ask for the formatted messages in this case.
74-
EnableEvents(eventSource, EventLevel.Error, LoggingEventSource.Keywords.FormattedMessage, args);
75-
}
76-
}
77-
protected override void OnEventWritten(EventWrittenEventArgs eventData) {
78-
// Look for the formatted message event, which has the following argument layout (as defined in the LoggingEventSource.
79-
// FormattedMessage(LogLevel Level, int FactoryID, string LoggerName, string EventId, string FormattedMessage);
80-
if (eventData.EventName == "FormattedMessage")
81-
Console.WriteLine("Logger {0}: {1}", eventData.Payload[2], eventData.Payload[4]);
82-
}
83-
}
84-
</summary>
85-
<remarks>To be added.</remarks>
22+
<summary>The LoggingEventSource is the bridge from all ILogger based logging to EventSource/EventListener logging.</summary>
23+
<remarks>
24+
<format type="text/markdown"><![CDATA[
25+
26+
## Remarks
27+
28+
You turn this logging on by enabling the EventSource called `Microsoft-Extensions-Logging`.
29+
30+
When you enabled the EventSource, the EventLevel you set is translated in the obvious way to the level
31+
associated with the ILogger (thus Debug = verbose, Informational = Informational ... Critical == Critical)
32+
33+
This allows you to filter by event level in a straightforward way.
34+
35+
For finer control you can specify a EventSource Argument called `FilterSpecs`.
36+
37+
The `FilterSpecs` argument is a semicolon separated list of specifications. Where each specification is
38+
39+
```
40+
SPEC = // empty spec, same as *
41+
| NAME // Just a name the level is the default level
42+
| NAME : LEVEL // specifies level for a particular logger (can have a * suffix).
43+
```
44+
45+
Where Name is the name of a ILoggger (case matters), Name can have a \* which acts as a wildcard
46+
AS A SUFFIX. Thus, Net\* will match any loggers that start with the 'Net'.
47+
48+
The LEVEL is a number or a LogLevel string. 0=Trace, 1=Debug, 2=Information, 3=Warning, 4=Error, Critical=5
49+
This specifies the level for the associated pattern. If the number is not specified, (first form
50+
of the specification) it is the default level for the EventSource.
51+
52+
First match is used if a particular name matches more than one pattern.
53+
54+
In addition to the level and FilterSpec argument, you can also set EventSource Keywords. See the Keywords
55+
definition below, but basically you get to decide if you wish to have
56+
57+
* Keywords.Message - You get the event with the data in parsed form.
58+
* Keywords.JsonMessage - you get an event with the data in parse form but as a JSON blob (not broken up by argument ...)
59+
* Keywords.FormattedMessage - you get an event with the data formatted as a string
60+
61+
It is expected that you will turn only one of these keywords on at a time, but you can turn them all on and get
62+
the same data logged three different ways.
63+
64+
## Examples
65+
66+
The following example shows how to use an EventListener to get ILogging information:
67+
68+
```csharp
69+
class MyEventListener : EventListener
70+
{
71+
protected override void OnEventSourceCreated(EventSource eventSource)
72+
{
73+
if (eventSource.Name == "Microsoft-Extensions-Logging")
74+
{
75+
// initialize a string, string dictionary of arguments to pass to the EventSource.
76+
// Turn on loggers matching App* to Information, everything else (*) is the default level (which is EventLevel.Error)
77+
var args = new Dictionary&lt;string, string&gt;() { { "FilterSpecs", "App*:Information;*" } };
78+
// Set the default level (verbosity) to Error, and only ask for the formatted messages in this case.
79+
EnableEvents(eventSource, EventLevel.Error, LoggingEventSource.Keywords.FormattedMessage, args);
80+
}
81+
}
82+
83+
protected override void OnEventWritten(EventWrittenEventArgs eventData)
84+
{
85+
// Look for the formatted message event, which has the following argument layout (as defined in the LoggingEventSource.
86+
// FormattedMessage(LogLevel Level, int FactoryID, string LoggerName, string EventId, string FormattedMessage);
87+
if (eventData.EventName == "FormattedMessage")
88+
Console.WriteLine("Logger {0}: {1}", eventData.Payload[2], eventData.Payload[4]);
89+
}
90+
}
91+
```
92+
93+
]]></format>
94+
</remarks>
8695
</Docs>
8796
<Members>
8897
<Member MemberName="OnEventCommand">

‎xml/System.Buffers/ArrayBufferWriter`1.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,8 @@ You must request a new buffer after calling `Advance` to continue writing more d
114114
]]></format>
115115
</remarks>
116116
<exception cref="T:System.ArgumentException">
117-
<paramref name="count" /> is negative.
118-
</exception>
119-
<exception cref="T:System.InvalidOperationException">
120-
The method call attempts to advance past the end of the underlying buffer.
121-
</exception>
117+
<paramref name="count" /> is negative.</exception>
118+
<exception cref="T:System.InvalidOperationException">The method call attempts to advance past the end of the underlying buffer.</exception>
122119
</Docs>
123120
</Member>
124121
<Member MemberName="Capacity">

‎xml/System.Buffers/SequenceReader`1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@
641641
<Docs>
642642
<param name="delimiters">The delimiters to search for.</param>
643643
<param name="advancePastDelimiter">
644-
<see langword="true" /> to move past the first instance of any of the given <paramref name="delimiters" />; <see lanword="false" /> to not move past the delimiter.</param>
644+
<see langword="true" /> to move past the first instance of any of the given <paramref name="delimiters" />; <see langword="false" /> to not move past the delimiter.</param>
645645
<summary>Searches for any of a number of specified delimiters and optionally advances past the first one to be found.</summary>
646646
<returns>
647647
<see langword="true" /> if any of the given <paramref name="delimiters" /> was found; otherwise, <see langword="false" />.</returns>

‎xml/System.Collections/CollectionBase.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,7 @@ A <xref:System.Collections.CollectionBase> instance is always modifiable. See <x
329329
</ReturnValue>
330330
<Docs>
331331
<summary>Gets the number of elements contained in the <see cref="T:System.Collections.CollectionBase" /> instance. This property cannot be overridden.</summary>
332-
<value>The number of elements contained in the <see cref="T:System.Collections.CollectionBase" /> instance.
333-
334-
Retrieving the value of this property is an `O(1)` operation.</value>
332+
<value>The number of elements contained in the <see cref="T:System.Collections.CollectionBase" /> instance. Retrieving the value of this property is an O(1) operation.</value>
335333
<remarks>
336334
<format type="text/markdown"><![CDATA[
337335
@@ -341,7 +339,7 @@ A <xref:System.Collections.CollectionBase> instance is always modifiable. See <x
341339
[!code-cpp[System.Collections.CollectionBase#1](~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Collections.CollectionBase/CPP/collectionbase.cpp#1)]
342340
[!code-csharp[System.Collections.CollectionBase#1](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Collections.CollectionBase/CS/collectionbase.cs#1)]
343341
[!code-vb[System.Collections.CollectionBase#1](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Collections.CollectionBase/VB/collectionbase.vb#1)]
344-
342+
345343
]]></format>
346344
</remarks>
347345
</Docs>
@@ -453,9 +451,7 @@ A <xref:System.Collections.CollectionBase> instance is always modifiable. See <x
453451
</ReturnValue>
454452
<Docs>
455453
<summary>Gets an <see cref="T:System.Collections.ArrayList" /> containing the list of elements in the <see cref="T:System.Collections.CollectionBase" /> instance.</summary>
456-
<value>An <see cref="T:System.Collections.ArrayList" /> representing the <see cref="T:System.Collections.CollectionBase" /> instance itself.
457-
458-
Retrieving the value of this property is an `O(1)` operation.</value>
454+
<value>An <see cref="T:System.Collections.ArrayList" /> representing the <see cref="T:System.Collections.CollectionBase" /> instance itself. Retrieving the value of this property is an O(1) operation.</value>
459455
<remarks>
460456
<format type="text/markdown"><![CDATA[
461457

‎xml/System.Collections/ReadOnlyCollectionBase.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,7 @@ A <xref:System.Collections.ReadOnlyCollectionBase> instance is always read-only.
157157
</ReturnValue>
158158
<Docs>
159159
<summary>Gets the number of elements contained in the <see cref="T:System.Collections.ReadOnlyCollectionBase" /> instance.</summary>
160-
<value>The number of elements contained in the <see cref="T:System.Collections.ReadOnlyCollectionBase" /> instance.
161-
162-
Retrieving the value of this property is an `O(1)` operation.</value>
160+
<value>The number of elements contained in the <see cref="T:System.Collections.ReadOnlyCollectionBase" /> instance. Retrieving the value of this property is an O(1) operation.</value>
163161
<remarks>
164162
<format type="text/markdown"><![CDATA[
165163

‎xml/System.ComponentModel.DataAnnotations/DisplayAttribute.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -543,11 +543,8 @@ End Class
543543
544544
]]></format>
545545
</remarks>
546-
<exception cref="T:System.InvalidOperationException">
547-
Both the <see cref="P:System.ComponentModel.DataAnnotations.DisplayAttribute.ResourceType" /> property and <see cref="P:System.ComponentModel.DataAnnotations.DisplayAttribute.ShortName" /> properties were set,
548-
but a public static property with a name matching the <see cref="P:System.ComponentModel.DataAnnotations.DisplayAttribute.ShortName" /> value couldn't be found
549-
on the <see cref="P:System.ComponentModel.DataAnnotations.DisplayAttribute.ResourceType" />.
550-
</exception>
546+
<exception cref="T:System.InvalidOperationException">Both the <see cref="P:System.ComponentModel.DataAnnotations.DisplayAttribute.ResourceType" /> property and <see cref="P:System.ComponentModel.DataAnnotations.DisplayAttribute.ShortName" /> properties were set,
547+
but a public static property with a name matching the <see cref="P:System.ComponentModel.DataAnnotations.DisplayAttribute.ShortName" /> value couldn't be found on the <see cref="P:System.ComponentModel.DataAnnotations.DisplayAttribute.ResourceType" />.</exception>
551548
</Docs>
552549
</Member>
553550
<Member MemberName="GroupName">

‎xml/System.ComponentModel/VersionConverter.xml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
</Base>
1515
<Interfaces />
1616
<Docs>
17-
<summary>
18-
<para>Provides a type converter to convert <see cref="T:System.Version" /> objects to and from various other representations.</para>
19-
</summary>
17+
<summary>Provides a type converter to convert <see cref="T:System.Version" /> objects to and from various other representations.</summary>
2018
<remarks>To be added.</remarks>
2119
</Docs>
2220
<Members>
@@ -59,9 +57,7 @@
5957
<Docs>
6058
<param name="context">An object that provides contextual information.</param>
6159
<param name="sourceType">The type of the object to be converted.</param>
62-
<summary>
63-
<para>Gets a value indicating whether this converter can convert an object in the given source type to a <see cref="T:System.Version" />.</para>
64-
</summary>
60+
<summary>Gets a value indicating whether this converter can convert an object in the given source type to a <see cref="T:System.Version" />.</summary>
6561
<returns>
6662
<see langword="true" /> if this converter can convert `sourceType` to a <see cref="T:System.Version" />; otherwise, <see langword="false" />.</returns>
6763
<remarks>To be added.</remarks>
@@ -89,9 +85,7 @@
8985
<Docs>
9086
<param name="context">An object that provides contextual information.</param>
9187
<param name="destinationType">The target type for the conversion.</param>
92-
<summary>
93-
<para>Gets a value indicating whether this converter can convert an object to the given destination type using the context.</para>
94-
</summary>
88+
<summary>Gets a value indicating whether this converter can convert an object to the given destination type using the context.</summary>
9589
<returns>
9690
<see langword="true" /> if the converter can convert an object to the given destination type; otherwise, <see langword="false" />.</returns>
9791
<remarks>To be added.</remarks>
@@ -155,9 +149,7 @@
155149
<param name="culture">The culture that supplies formatting information for the conversion.</param>
156150
<param name="value">The value to be converted.</param>
157151
<param name="destinationType">The type to convert the value parameter to.</param>
158-
<summary>
159-
<para>Converts the specified value to the specified destination type using the specified context and arguments.</para>
160-
</summary>
152+
<summary>Converts the specified value to the specified destination type using the specified context and arguments.</summary>
161153
<returns>An object that represents the converted value.</returns>
162154
<remarks>To be added.</remarks>
163155
</Docs>

0 commit comments

Comments
 (0)