Skip to content

Merge master into live #4375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 15, 2020
+27 −60
Merged

Merge master into live #4375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8707dc7
HttpRequestException.StatusCode property and ctor
alnikola Jun 5, 2020
dd3e622
Apply suggestions from code review
alnikola Jun 11, 2020
d3e4d09
ServerCertificateSelectionCallback - update documentation (#4351)
Jun 12, 2020
327a855
WebHeaderCollection: update item[string] property (#4268)
Jun 12, 2020
c5f3a6b
MediaTypeNames+Application - update documentation (#4324)
Jun 12, 2020
f9e83bd
HttpRequestException.StatusCode property and ctor
alnikola Jun 12, 2020
f3f8993
Merge branch 'master' into publish-15058
cxwtool Jun 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions xml/System.Net.Http/HttpRequestException.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,10 @@
<Parameter Name="statusCode" Type="System.Nullable&lt;System.Net.HttpStatusCode&gt;" Index="2" FrameworkAlternate="net-5.0" />
</Parameters>
<Docs>
<param name="message">To be added.</param>
<param name="inner">To be added.</param>
<param name="statusCode">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
<param name="message">A message that describes the current exception.</param>
<param name="inner">The inner exception.</param>
<param name="statusCode">The HTTP status code.</param>
<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>
</Docs>
</Member>
<Member MemberName="StatusCode">
Expand All @@ -191,9 +190,9 @@
<ReturnType>System.Nullable&lt;System.Net.HttpStatusCode&gt;</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
<value>To be added.</value>
<remarks>To be added.</remarks>
<summary>Gets the HTTP status code to be returned with the exception.</summary>
<value>An HTTP status code if the exception represents a non-successful result, otherwise <c>null</c>.</value>
<remarks>This property was introduced in .NET 5.0.</remarks>
</Docs>
</Member>
</Members>
Expand Down
4 changes: 2 additions & 2 deletions xml/System.Net.Mime/MediaTypeNames+Application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
<summary>Specifies that the <see cref="T:System.Net.Mime.MediaTypeNames.Application" /> data is in JSON format.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
Expand Down Expand Up @@ -233,7 +233,7 @@
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
<summary>Specifies that the <see cref="T:System.Net.Mime.MediaTypeNames.Application" /> data is in XML format.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
Expand Down
20 changes: 15 additions & 5 deletions xml/System.Net.Security/ServerCertificateSelectionCallback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,20 @@
<ReturnType>System.Security.Cryptography.X509Certificates.X509Certificate</ReturnType>
</ReturnValue>
<Docs>
<param name="sender">To be added.</param>
<param name="hostName">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
<param name="sender">A <see cref="T:System.Net.Security.SslStream" /> object.</param>
<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>
<summary>Selects the server Secure Sockets Layer (SSL) certificate.</summary>
<returns>An <see cref="T:System.Security.Cryptography.X509Certificates.X509Certificate" /> used for establishing an SSL connection.</returns>
<remarks>
<format type="text/markdown"><![CDATA[

## Remarks

The server uses this delegate to select a server connection certificate.

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.

]]></format>
</remarks>
</Docs>
</Type>
48 changes: 3 additions & 45 deletions xml/System.Net/WebHeaderCollection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,49 +1448,7 @@
<exception cref="T:System.ArgumentOutOfRangeException">The length of <paramref name="value" /> is greater than 65535.</exception>
<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>
</Docs>
</Member>
<Member MemberName="Item">
<MemberSignature Language="C#" Value="public string this[string name] { get; set; }" />
<MemberSignature Language="ILAsm" Value=".property instance string Item(string)" />
<MemberSignature Language="DocId" Value="P:System.Net.WebHeaderCollection.Item(System.String)" />
<MemberSignature Language="VB.NET" Value="Default Public Property Item(name As String) As String" />
<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); };" />
<MemberSignature Language="F#" Value="member this.Item(string) : string with get, set" Usage="System.Net.WebHeaderCollection.Item" />
<MemberType>Property</MemberType>
<AssemblyInfo>
<AssemblyName>System.Net.WebHeaderCollection</AssemblyName>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<AssemblyVersion>4.1.0.0</AssemblyVersion>
<AssemblyVersion>4.1.1.0</AssemblyVersion>
<AssemblyVersion>4.1.2.0</AssemblyVersion>
<AssemblyVersion>5.0.0.0</AssemblyVersion>
</AssemblyInfo>
<AssemblyInfo>
<AssemblyName>System.Net.Requests</AssemblyName>
</AssemblyInfo>
<AssemblyInfo>
<AssemblyName>netstandard</AssemblyName>
<AssemblyVersion>2.1.0.0</AssemblyVersion>
</AssemblyInfo>
<AssemblyInfo>
<AssemblyName>System</AssemblyName>
</AssemblyInfo>
<AssemblyInfo>
<AssemblyName>System.Net</AssemblyName>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Parameters>
<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" />
</Parameters>
<Docs>
<param name="name">To be added.</param>
<summary>To be added.</summary>
<value>To be added.</value>
<remarks>To be added.</remarks>
</Docs>
</Member>
</Member>
<Member MemberName="Keys">
<MemberSignature Language="C#" Value="public override System.Collections.Specialized.NameObjectCollectionBase.KeysCollection Keys { get; }" />
<MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Specialized.NameObjectCollectionBase/KeysCollection Keys" />
Expand Down Expand Up @@ -1997,8 +1955,8 @@
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added.</summary>
<returns>To be added.</returns>
<summary>Returns an enumerator that can iterate through the <see cref="T:System.Net.WebHeaderCollection" /> instance.</summary>
<returns>An <see cref="T:System.Collections.IEnumerator" /> for the <see cref="T:System.Net.WebHeaderCollection" />.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
Expand Down