Skip to content

Commit a47e9b2

Browse files
BillWagnerBillWagner
authored
Merge pull request #4375 from dotnet/publish-15058
Merge master into live
2 parents 4393a61 + f3f8993 commit a47e9b2

File tree

4 files changed

+27
-60
lines changed

4 files changed

+27
-60
lines changed

‎xml/System.Net.Http/HttpRequestException.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,10 @@
165165
<Parameter Name="statusCode" Type="System.Nullable&lt;System.Net.HttpStatusCode&gt;" Index="2" FrameworkAlternate="net-5.0" />
166166
</Parameters>
167167
<Docs>
168-
<param name="message">To be added.</param>
169-
<param name="inner">To be added.</param>
170-
<param name="statusCode">To be added.</param>
171-
<summary>To be added.</summary>
172-
<remarks>To be added.</remarks>
168+
<param name="message">A message that describes the current exception.</param>
169+
<param name="inner">The inner exception.</param>
170+
<param name="statusCode">The HTTP status code.</param>
171+
<summary>Initializes a new instance of the <see cref="T:System.Net.Http.HttpRequestException" /> class with a specific message that describes the current exception, an inner exception, and an HTTP status code.</summary>
173172
</Docs>
174173
</Member>
175174
<Member MemberName="StatusCode">
@@ -191,9 +190,9 @@
191190
<ReturnType>System.Nullable&lt;System.Net.HttpStatusCode&gt;</ReturnType>
192191
</ReturnValue>
193192
<Docs>
194-
<summary>To be added.</summary>
195-
<value>To be added.</value>
196-
<remarks>To be added.</remarks>
193+
<summary>Gets the HTTP status code to be returned with the exception.</summary>
194+
<value>An HTTP status code if the exception represents a non-successful result, otherwise <c>null</c>.</value>
195+
<remarks>This property was introduced in .NET 5.0.</remarks>
197196
</Docs>
198197
</Member>
199198
</Members>

‎xml/System.Net.Mime/MediaTypeNames+Application.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<ReturnType>System.String</ReturnType>
6565
</ReturnValue>
6666
<Docs>
67-
<summary>To be added.</summary>
67+
<summary>Specifies that the <see cref="T:System.Net.Mime.MediaTypeNames.Application" /> data is in JSON format.</summary>
6868
<remarks>To be added.</remarks>
6969
</Docs>
7070
</Member>
@@ -233,7 +233,7 @@
233233
<ReturnType>System.String</ReturnType>
234234
</ReturnValue>
235235
<Docs>
236-
<summary>To be added.</summary>
236+
<summary>Specifies that the <see cref="T:System.Net.Mime.MediaTypeNames.Application" /> data is in XML format.</summary>
237237
<remarks>To be added.</remarks>
238238
</Docs>
239239
</Member>

‎xml/System.Net.Security/ServerCertificateSelectionCallback.xml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,20 @@
2929
<ReturnType>System.Security.Cryptography.X509Certificates.X509Certificate</ReturnType>
3030
</ReturnValue>
3131
<Docs>
32-
<param name="sender">To be added.</param>
33-
<param name="hostName">To be added.</param>
34-
<summary>To be added.</summary>
35-
<returns>To be added.</returns>
36-
<remarks>To be added.</remarks>
32+
<param name="sender">A <see cref="T:System.Net.Security.SslStream" /> object.</param>
33+
<param name="hostName">The host name requested by the client. If the client doesn't use the host_name TLS extension, the <paramref name="hostName" /> is an empty string.</param>
34+
<summary>Selects the server Secure Sockets Layer (SSL) certificate.</summary>
35+
<returns>An <see cref="T:System.Security.Cryptography.X509Certificates.X509Certificate" /> used for establishing an SSL connection.</returns>
36+
<remarks>
37+
<format type="text/markdown"><![CDATA[
38+
39+
## Remarks
40+
41+
The server uses this delegate to select a server connection certificate.
42+
43+
This delegate is used by the <xref:System.Net.Security.SslStream> class. The <xref:System.Net.Security.SslStream> class is used to help secure information exchanged between a client and server.
44+
45+
]]></format>
46+
</remarks>
3747
</Docs>
3848
</Type>

‎xml/System.Net/WebHeaderCollection.xml

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1448,49 +1448,7 @@
14481448
<exception cref="T:System.ArgumentOutOfRangeException">The length of <paramref name="value" /> is greater than 65535.</exception>
14491449
<exception cref="T:System.InvalidOperationException">This <see cref="T:System.Net.WebHeaderCollection" /> instance does not allow instances of <see cref="T:System.Net.HttpResponseHeader" />.</exception>
14501450
</Docs>
1451-
</Member>
1452-
<Member MemberName="Item">
1453-
<MemberSignature Language="C#" Value="public string this[string name] { get; set; }" />
1454-
<MemberSignature Language="ILAsm" Value=".property instance string Item(string)" />
1455-
<MemberSignature Language="DocId" Value="P:System.Net.WebHeaderCollection.Item(System.String)" />
1456-
<MemberSignature Language="VB.NET" Value="Default Public Property Item(name As String) As String" />
1457-
<MemberSignature Language="C++ CLI" Value="public:&#xA; property System::String ^ default[System::String ^] { System::String ^ get(System::String ^ name); void set(System::String ^ name, System::String ^ value); };" />
1458-
<MemberSignature Language="F#" Value="member this.Item(string) : string with get, set" Usage="System.Net.WebHeaderCollection.Item" />
1459-
<MemberType>Property</MemberType>
1460-
<AssemblyInfo>
1461-
<AssemblyName>System.Net.WebHeaderCollection</AssemblyName>
1462-
<AssemblyVersion>4.0.0.0</AssemblyVersion>
1463-
<AssemblyVersion>4.1.0.0</AssemblyVersion>
1464-
<AssemblyVersion>4.1.1.0</AssemblyVersion>
1465-
<AssemblyVersion>4.1.2.0</AssemblyVersion>
1466-
<AssemblyVersion>5.0.0.0</AssemblyVersion>
1467-
</AssemblyInfo>
1468-
<AssemblyInfo>
1469-
<AssemblyName>System.Net.Requests</AssemblyName>
1470-
</AssemblyInfo>
1471-
<AssemblyInfo>
1472-
<AssemblyName>netstandard</AssemblyName>
1473-
<AssemblyVersion>2.1.0.0</AssemblyVersion>
1474-
</AssemblyInfo>
1475-
<AssemblyInfo>
1476-
<AssemblyName>System</AssemblyName>
1477-
</AssemblyInfo>
1478-
<AssemblyInfo>
1479-
<AssemblyName>System.Net</AssemblyName>
1480-
</AssemblyInfo>
1481-
<ReturnValue>
1482-
<ReturnType>System.String</ReturnType>
1483-
</ReturnValue>
1484-
<Parameters>
1485-
<Parameter Name="name" Type="System.String" Index="0" FrameworkAlternate="dotnet-uwp-10.0;net-5.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netstandard-2.1" />
1486-
</Parameters>
1487-
<Docs>
1488-
<param name="name">To be added.</param>
1489-
<summary>To be added.</summary>
1490-
<value>To be added.</value>
1491-
<remarks>To be added.</remarks>
1492-
</Docs>
1493-
</Member>
1451+
</Member>
14941452
<Member MemberName="Keys">
14951453
<MemberSignature Language="C#" Value="public override System.Collections.Specialized.NameObjectCollectionBase.KeysCollection Keys { get; }" />
14961454
<MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Specialized.NameObjectCollectionBase/KeysCollection Keys" />
@@ -1997,8 +1955,8 @@
19971955
</ReturnValue>
19981956
<Parameters />
19991957
<Docs>
2000-
<summary>To be added.</summary>
2001-
<returns>To be added.</returns>
1958+
<summary>Returns an enumerator that can iterate through the <see cref="T:System.Net.WebHeaderCollection" /> instance.</summary>
1959+
<returns>An <see cref="T:System.Collections.IEnumerator" /> for the <see cref="T:System.Net.WebHeaderCollection" />.</returns>
20021960
<remarks>To be added.</remarks>
20031961
</Docs>
20041962
</Member>

0 commit comments

Comments
 (0)