From 5e37f399fe119a7e4c7d768e65452a3dec739c0c Mon Sep 17 00:00:00 2001 From: Rick Myers Date: Wed, 30 Oct 2024 11:34:24 -0400 Subject: [PATCH 1/5] Update JsonSerializerOptions.xml (#10330) --- xml/System.Text.Json/JsonSerializerOptions.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xml/System.Text.Json/JsonSerializerOptions.xml b/xml/System.Text.Json/JsonSerializerOptions.xml index 3662e7efb93..c8caf40013e 100644 --- a/xml/System.Text.Json/JsonSerializerOptions.xml +++ b/xml/System.Text.Json/JsonSerializerOptions.xml @@ -686,8 +686,10 @@ For more information, see [How to ignore properties with System.Text.Json](/dotn Gets or sets a value that indicates whether fields are handled during serialization and deserialization. The default value is . - if fields are included during serialization; otherwise, . - To be added. + if public fields are included during serialization; otherwise, . + This flag only enables serialization for public fields, as is the case for properties. + Private members need to be opted into individually using the attribute. + This property is set after serialization or deserialization has occurred. From fcc3a28b6f39547ccab14a1346d635c8b990c3b7 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Wed, 30 Oct 2024 10:22:54 -0700 Subject: [PATCH 2/5] Document a behavior of string.Create --- xml/System/String.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xml/System/String.xml b/xml/System/String.xml index 1b789b79215..825e4ddd05d 100644 --- a/xml/System/String.xml +++ b/xml/System/String.xml @@ -4364,6 +4364,8 @@ The following example demonstrates the method. From c811318e8c13f17e36c9817616e5cccf74cfa7d6 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Wed, 30 Oct 2024 11:18:34 -0700 Subject: [PATCH 3/5] Apply suggestions from code review --- xml/System/String.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml/System/String.xml b/xml/System/String.xml index 825e4ddd05d..99fa8231345 100644 --- a/xml/System/String.xml +++ b/xml/System/String.xml @@ -4365,7 +4365,7 @@ The following example demonstrates the method. ## Remarks The initial content of the destination span passed to `action` is undefined. Therefore, it is the delegate's responsibility to ensure that every element of the span is assigned. Otherwise, the resulting string could contain random characters. -In order to support interop scenarios, the underlying buffer is guaranteed to be at least 1 greater than represented by the span parameter of the action callback. This additional index represents the null-terminator and if written that is the only value supported, writing any value other than the null-terminator will result in corrupting the string and is considered undefined behavior. +To support interop scenarios, the underlying buffer is guaranteed to be at least 1 greater than represented by the span parameter of the action callback. This additional index represents the null-terminator and, if written, that is the only value supported. Writing any value other than the null-terminator corrupts the string and is considered undefined behavior. ]]> From f68c2579c4ce33043fe635a7bd0ccf48b84a7449 Mon Sep 17 00:00:00 2001 From: Christoph Hannebauer Date: Wed, 30 Oct 2024 21:37:30 +0100 Subject: [PATCH 4/5] Corrected wrong value of ClientCertificateOptions (#10608) * Corrected wrong value of ClientCertificateOptions * Apply review suggestion Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com> --------- Co-authored-by: Miha Zupan Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com> --- xml/System.Net.Http/HttpClientHandler.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml/System.Net.Http/HttpClientHandler.xml b/xml/System.Net.Http/HttpClientHandler.xml index c6ef2c31f73..a0f8c8586f4 100644 --- a/xml/System.Net.Http/HttpClientHandler.xml +++ b/xml/System.Net.Http/HttpClientHandler.xml @@ -281,7 +281,7 @@ After NuGet package v4.3.2, the default value of Gets or sets a value that indicates if the certificate is automatically picked from the certificate store or if the caller is allowed to pass in a specific client certificate. - The collection of security certificates associated with this handler. + One of the enumeration values. The default value is . To be added. From 0121963845fa0e0d7c38ff03779620b97a2b60a5 Mon Sep 17 00:00:00 2001 From: Robin Lindner Date: Wed, 30 Oct 2024 23:25:38 +0100 Subject: [PATCH 5/5] Fix supported schemes in docs (#10600) * Fix supported schemes in docs * Tweak proxy description --------- Co-authored-by: Miha Zupan --- xml/System.Net.Http/HttpClient.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xml/System.Net.Http/HttpClient.xml b/xml/System.Net.Http/HttpClient.xml index 1489a4c9230..9820a116965 100644 --- a/xml/System.Net.Http/HttpClient.xml +++ b/xml/System.Net.Http/HttpClient.xml @@ -362,7 +362,15 @@ The environment variables used for `DefaultProxy` initialization on Windows and On systems where environment variables are case-sensitive, the variable names may be all lowercase or all uppercase. The lowercase names are checked first. -The proxy server may be a hostname or IP address, optionally followed by a colon and port number, or it may be an http URL, optionally including a username and password for proxy authentication. The URL must be start with `http`, not `https`, and cannot include any text after the hostname, IP, or port. +The proxy server may be a hostname or IP address, optionally followed by a colon and port number, or it may be an `http`, `https`, `socks4`, `socks4a`, or `socks5` URL. The URL cannot include any text after the hostname, IP, or port. If a scheme isn't specified, `http` is assumed. +The URL may optionally include a username and password for proxy authentication, but the password is ignored when using `socks4` or `socks4a` as the protocols have no support for password authentication. + +* **`http`**: `http://[username:password@]hostname[:port]` +* **`https`**: `https://[username:password@]hostname[:port]` +* **`socks4`**: `socks4://[username@]hostname[:port]` +* **`socks4a`**: `socks4a://[username@]hostname[:port]` +* **`socks5`**: `socks5://[username:password@]hostname[:port]` + ]]> The value passed cannot be .