Skip to content

Commit 5382231

Browse files
Merge pull request #43844 from dotnet/main
Merge main into live
2 parents 995c846 + 0f86bea commit 5382231

File tree

98 files changed

+872
-691
lines changed

Some content is hidden

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

98 files changed

+872
-691
lines changed

.openpublishing.redirection.csharp.json

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4174,7 +4174,7 @@
41744174
},
41754175
{
41764176
"source_path_from_root": "/docs/csharp/tutorials/exploration/patterns-objects.md",
4177-
"redirect_url": "/dotnet/csharp/whats-new/tutorials/patterns-objects"
4177+
"redirect_url": "/dotnet/csharp/tutorials/patterns-objects"
41784178
},
41794179
{
41804180
"source_path_from_root": "/docs/csharp/tutorials/exploration/records.md",
@@ -4297,13 +4297,17 @@
42974297
"source_path_from_root": "/docs/csharp/whats-new/csharp-7.md",
42984298
"redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-70"
42994299
},
4300+
{
4301+
"source_path_from_root": "/docs/csharp/whats-new/csharp-8.md",
4302+
"redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-80"
4303+
},
43004304
{
43014305
"source_path_from_root": "/docs/csharp/whats-new/csharp-9.md",
43024306
"redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-9"
43034307
},
43044308
{
4305-
"source_path_from_root": "/docs/csharp/whats-new/csharp-8.md",
4306-
"redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-80"
4309+
"source_path_from_root": "/docs/csharp/whats-new/csharp-10.md",
4310+
"redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-10"
43074311
},
43084312
{
43094313
"source_path_from_root": "/docs/csharp/whats-new/index.md",
@@ -4334,6 +4338,14 @@
43344338
"source_path_from_root": "/docs/csharp/whats-new/tutorials/ranges-indexes.md",
43354339
"redirect_url": "/dotnet/csharp/tutorials/ranges-indexes"
43364340
},
4341+
{
4342+
"source_path_from_root": "/docs/csharp/whats-new/tutorials/interpolated-string-handler.md",
4343+
"redirect_url": "/dotnet/csharp/advanced-topics/performance/interpolated-string-handler"
4344+
},
4345+
{
4346+
"source_path_from_root": "/docs/csharp/whats-new/tutorials/patterns-objects.md",
4347+
"redirect_url": "/dotnet/csharp/tutorials/patterns-objects"
4348+
},
43374349
{
43384350
"source_path_from_root": "/docs/csharp/write-safe-efficient-code.md",
43394351
"redirect_url": "/dotnet/csharp/advanced-topics/performance"

.openpublishing.redirection.standard.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,10 @@
524524
"source_path_from_root": "/docs/standard/serialization/how-to-determine-if-netstandard-object-is-serializable.md",
525525
"redirect_url": "/dotnet/standard/serialization/binaryformatter-security-guide"
526526
},
527+
{
528+
"source_path_from_root": "/docs/standard/serialization/system-text-json/supported-collection-types.md",
529+
"redirect_url": "/dotnet/standard/serialization/system-text-json/supported-types"
530+
},
527531
{
528532
"source_path_from_root": "/docs/standard/index.yml",
529533
"redirect_url": "/dotnet/fundamentals/"

docs/core/compatibility/networking/9.0/query-redaction-events.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ai-usage: ai-assisted
77

88
# URI query and fragment redaction in HttpClient EventSource events
99

10-
In .NET 9, the default behavior of <xref:System.Diagnostics.Tracing.EventSource> events emitted by <xref:System.Net.Http.HttpClient> and <xref:System.Net.Http.SocketsHttpHandler> (`EventSource` name: `System.Net.Http`) has been modified to scrub the query and the fragment part of the Uri. This change enhances privacy by preventing the logging of potentially sensitive information contained in query strings while keeping the performance costs of the redaction minimal. If necessary, you can override this behavior.
10+
In .NET 9, the default behavior of <xref:System.Diagnostics.Tracing.EventSource> events emitted by <xref:System.Net.Http.HttpClient> and <xref:System.Net.Http.SocketsHttpHandler> (`EventSource` name: `System.Net.Http`) has been modified to scrub the query and fragment part of the URI. This change enhances privacy by preventing the logging of potentially sensitive information contained in query strings while keeping the performance costs of the redaction minimal. If necessary, you can override this behavior.
1111

1212
## Version introduced
1313

@@ -19,15 +19,15 @@ Previously, events emitted by `HttpClient` and `SocketsHttpHandler` included que
1919

2020
## New behavior
2121

22-
With the change in [dotnet/runtime#104741](https://github.com/dotnet/runtime/pull/104741), the query and the fragment part by a `*` character in `HttpClient` and `SocketsHttpHandler` events, by default. This change affects specific events and parameters such as `pathAndQuery` in `RequestStart` and `redirectUri` in `Redirect`.
22+
With the change in [dotnet/runtime#104741](https://github.com/dotnet/runtime/pull/104741), the query and fragment part are replaced by a `*` character in `HttpClient` and `SocketsHttpHandler` events, by default. This change affects specific events and parameters, such as `pathAndQuery` in `RequestStart` and `redirectUri` in `Redirect`.
2323

2424
## Type of breaking change
2525

2626
This change is a [behavioral change](../../categories.md#behavioral-change).
2727

2828
## Reason for change
2929

30-
The primary reason for this change was to enhance privacy by reducing the risk of sensitive information being logged inadvertently. Query strings often contain sensitive data, and redacting them from logs by default helps protect this information. To keep the implementation simple and efficient, the fragment part is also being scrubbed together with the query.
30+
The primary reason for this change was to enhance privacy by reducing the risk of sensitive information being logged inadvertently. Query strings often contain sensitive data, and redacting them from logs by default helps protect this information. To keep the implementation simple and efficient, the fragment part is also scrubbed.
3131

3232
## Recommended action
3333

docs/core/compatibility/networking/9.0/query-redaction-logs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ Previously, the default implementation of `IHttpClientFactory` logging included
1919

2020
## New behavior
2121

22-
The messages passed to <xref:Microsoft.Extensions.Logging.ILogger> now have the query and the fragment part replaced by a `*` character.
22+
The messages passed to <xref:Microsoft.Extensions.Logging.ILogger> now have the query and fragment part replaced by a `*` character.
2323

2424
## Type of breaking change
2525

2626
This change is a [behavioral change](../../categories.md#behavioral-change).
2727

2828
## Reason for change
2929

30-
The primary reason for this change is to enhance privacy by reducing the risk of sensitive information being logged inadvertently. Query strings often contain sensitive data and excluding them from logs by default helps protect this information. The fragment part is being scrubbed to keep the implementation simple and efficient.
30+
The primary reason for this change is to enhance privacy by reducing the risk of sensitive information being logged inadvertently. Query strings often contain sensitive data and excluding them from logs by default helps protect this information. To keep the implementation simple and efficient, the fragment part is also scrubbed.
3131

3232
## Recommended action
3333

0 commit comments

Comments
 (0)