Merge pull request #39767 from dotnet/main

Merge main into live

.openpublishing.redirection.core.json

@@ -1224,7 +1224,7 @@
         },
         {
             "source_path_from_root": "/docs/core/whats-new/index.md",
-            "redirect_url": "/dotnet/core/whats-new/dotnet-8",
+            "redirect_url": "/dotnet/core/whats-new/dotnet-8/overview",
             "ms.custom": "updateeachrelease"
         },
         {

.openpublishing.redirection.csharp.json

@@ -3166,15 +3166,15 @@
         },
         {
             "source_path_from_root": "/docs/csharp/programming-guide/linq-query-expressions/how-to-create-a-nested-group.md",
-            "redirect_url": "/dotnet/csharp/linq/create-a-nested-group"
+            "redirect_url": "/dotnet/csharp/linq/standard-query-operators/grouping-data"
         },
         {
             "source_path_from_root": "/docs/csharp/programming-guide/linq-query-expressions/how-to-dynamically-specify-predicate-filters-at-runtime.md",
             "redirect_url": "/dotnet/csharp/linq/dynamically-specify-predicate-filters-at-runtime"
         },
         {
             "source_path_from_root": "/docs/csharp/programming-guide/linq-query-expressions/how-to-group-query-results.md",
-            "redirect_url": "/dotnet/csharp/linq/group-query-results"
+            "redirect_url": "/dotnet/csharp/linq/standard-query-operators/grouping-data"
         },
         {
             "source_path_from_root": "/docs/csharp/programming-guide/linq-query-expressions/how-to-group-results-by-contiguous-keys.md",
@@ -3190,31 +3190,31 @@
         },
         {
             "source_path_from_root": "/docs/csharp/programming-guide/linq-query-expressions/how-to-join-by-using-composite-keys.md",
-            "redirect_url": "/dotnet/csharp/linq/join-by-using-composite-keys"
+            "redirect_url": "/dotnet/csharp/linq/standard-query-operators/join-operations"
         },
         {
             "source_path_from_root": "/docs/csharp/programming-guide/linq-query-expressions/how-to-order-the-results-of-a-join-clause.md",
-            "redirect_url": "/dotnet/csharp/linq/order-the-results-of-a-join-clause"
+            "redirect_url": "/dotnet/csharp/linq/standard-query-operators/"
         },
         {
             "source_path_from_root": "/docs/csharp/programming-guide/linq-query-expressions/how-to-perform-a-subquery-on-a-grouping-operation.md",
-            "redirect_url": "/dotnet/csharp/linq/perform-a-subquery-on-a-grouping-operation"
+            "redirect_url": "/dotnet/csharp/linq/standard-query-operators/grouping-data"
         },
         {
             "source_path_from_root": "/docs/csharp/programming-guide/linq-query-expressions/how-to-perform-custom-join-operations.md",
-            "redirect_url": "/dotnet/csharp/linq/perform-custom-join-operations"
+            "redirect_url": "/dotnet/csharp/linq/"
         },
         {
             "source_path_from_root": "/docs/csharp/programming-guide/linq-query-expressions/how-to-perform-grouped-joins.md",
-            "redirect_url": "/dotnet/csharp/linq/perform-grouped-joins"
+            "redirect_url": "/dotnet/csharp/linq/standard-query-operators/join-operations"
         },
         {
             "source_path_from_root": "/docs/csharp/programming-guide/linq-query-expressions/how-to-perform-inner-joins.md",
-            "redirect_url": "/dotnet/csharp/linq/perform-inner-joins"
+            "redirect_url": "/dotnet/csharp/linq/standard-query-operators/join-operations"
         },
         {
             "source_path_from_root": "/docs/csharp/programming-guide/linq-query-expressions/how-to-perform-left-outer-joins.md",
-            "redirect_url": "/dotnet/csharp/linq/perform-left-outer-joins"
+            "redirect_url": "/dotnet/csharp/linq/standard-query-operators/join-operations"
         },
         {
             "source_path_from_root": "/docs/csharp/programming-guide/linq-query-expressions/how-to-query-a-collection-of-objects.md",

docs/azure/includes/dotnet-new.md

@@ -30,6 +30,7 @@
 | Dev Center | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.Developer.DevCenter/1.0.0-beta.3) | [docs](/dotnet/api/overview/azure/Developer.DevCenter-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Developer.DevCenter_1.0.0-beta.3/sdk/devcenter/Azure.Developer.DevCenter/) |
 | Device Update | NuGet [1.0.0](https://www.nuget.org/packages/Azure.IoT.DeviceUpdate/1.0.0) | [docs](/dotnet/api/overview/azure/IoT.DeviceUpdate-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.IoT.DeviceUpdate_1.0.0/sdk/deviceupdate/Azure.IoT.DeviceUpdate/) |
 | Digital Twins | NuGet [1.4.0](https://www.nuget.org/packages/Azure.DigitalTwins.Core/1.4.0) | [docs](/dotnet/api/overview/azure/DigitalTwins.Core-readme) | GitHub [1.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.DigitalTwins.Core_1.4.0/sdk/digitaltwins/Azure.DigitalTwins.Core/) |
+| Document Intelligence | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.AI.DocumentIntelligence/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/AI.DocumentIntelligence-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.DocumentIntelligence_1.0.0-beta.1/sdk/documentintelligence/Azure.AI.DocumentIntelligence/) |
 | Document Translation | NuGet [1.0.0](https://www.nuget.org/packages/Azure.AI.Translation.Document/1.0.0) | [docs](/dotnet/api/overview/azure/AI.Translation.Document-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Translation.Document_1.0.0/sdk/translation/Azure.AI.Translation.Document/) |
 | Event Grid | NuGet [4.22.0](https://www.nuget.org/packages/Azure.Messaging.EventGrid/4.22.0) | [docs](/dotnet/api/overview/azure/Messaging.EventGrid-readme) | GitHub [4.22.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Messaging.EventGrid_4.22.0/sdk/eventgrid/Azure.Messaging.EventGrid/) |
 | Event Hubs | NuGet [5.11.0](https://www.nuget.org/packages/Azure.Messaging.EventHubs/5.11.0) | [docs](/dotnet/api/overview/azure/Messaging.EventHubs-readme) | GitHub [5.11.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Messaging.EventHubs_5.11.0/sdk/eventhub/Azure.Messaging.EventHubs/) |
@@ -196,7 +197,7 @@
 | Resource Management - Hybrid Kubernetes | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.Kubernetes/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.Kubernetes-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Kubernetes_1.0.0-beta.4/sdk/hybridkubernetes/Azure.ResourceManager.Kubernetes/) |
 | Resource Management - Hybrid Network | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.HybridNetwork/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.HybridNetwork-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.HybridNetwork_1.0.0-beta.2/sdk/hybridnetwork/Azure.ResourceManager.HybridNetwork/) |
 | Resource Management - IoT Central | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.IotCentral/1.0.1)<br>NuGet [1.1.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.IotCentral/1.1.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.IotCentral-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotCentral_1.0.1/sdk/iotcentral/Azure.ResourceManager.IotCentral/)<br>GitHub [1.1.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotCentral_1.1.0-beta.2/sdk/iotcentral/Azure.ResourceManager.IotCentral/) |
-| Resource Management - IoT Firmware Defense | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.IotFirmwareDefense/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.IotFirmwareDefense-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotFirmwareDefense_1.0.0-beta.2/sdk/iot/Azure.ResourceManager.IotFirmwareDefense/) |
+| Resource Management - IoT Firmware Defense | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.IotFirmwareDefense/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.IotFirmwareDefense-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotFirmwareDefense_1.0.0/sdk/iot/Azure.ResourceManager.IotFirmwareDefense/) |
 | Resource Management - IoT Hub | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.IotHub/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.IotHub-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotHub_1.1.1/sdk/iothub/Azure.ResourceManager.IotHub/) |
 | Resource Management - Key Vault | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.KeyVault/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.KeyVault-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.KeyVault_1.2.0/sdk/keyvault/Azure.ResourceManager.KeyVault/) |
 | Resource Management - Kubernetes Configuration | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.KubernetesConfiguration/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.KubernetesConfiguration-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.KubernetesConfiguration_1.2.0/sdk/kubernetesconfiguration/Azure.ResourceManager.KubernetesConfiguration/) |
@@ -256,7 +257,7 @@
 | Resource Management - Resource Connector | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.ResourceConnector/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.ResourceConnector-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ResourceConnector_1.0.0-beta.2/sdk/resourceconnector/Azure.ResourceManager.ResourceConnector/) |
 | Resource Management - Resource Graph | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.ResourceGraph/1.0.1)<br>NuGet [1.1.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.ResourceGraph/1.1.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.ResourceGraph-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ResourceGraph_1.0.1/sdk/resourcegraph/Azure.ResourceManager.ResourceGraph/)<br>GitHub [1.1.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ResourceGraph_1.1.0-beta.2/sdk/resourcegraph/Azure.ResourceManager.ResourceGraph/) |
 | Resource Management - Resource Health | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.ResourceHealth/1.0.0)<br>NuGet [1.1.0-beta.3](https://www.nuget.org/packages/Azure.ResourceManager.ResourceHealth/1.1.0-beta.3) | [docs](/dotnet/api/overview/azure/ResourceManager.ResourceHealth-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ResourceHealth_1.0.0/sdk/resourcehealth/Azure.ResourceManager.ResourceHealth/)<br>GitHub [1.1.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ResourceHealth_1.1.0-beta.3/sdk/resourcehealth/Azure.ResourceManager.ResourceHealth/) |
-| Resource Management - Resource Manager | NuGet [1.10.1](https://www.nuget.org/packages/Azure.ResourceManager/1.10.1)<br>NuGet [1.11.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager/1.11.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager-readme) | GitHub [1.10.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager_1.10.1/sdk/resourcemanager/Azure.ResourceManager/)<br>GitHub [1.11.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager_1.11.0-beta.1/sdk/resourcemanager/Azure.ResourceManager/) |
+| Resource Management - Resource Manager | NuGet [1.10.2](https://www.nuget.org/packages/Azure.ResourceManager/1.10.2)<br>NuGet [1.11.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager/1.11.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager-readme) | GitHub [1.10.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager_1.10.2/sdk/resourcemanager/Azure.ResourceManager/)<br>GitHub [1.11.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager_1.11.0-beta.1/sdk/resourcemanager/Azure.ResourceManager/) |
 | Resource Management - Resource Mover | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.ResourceMover/1.1.1)<br>NuGet [1.1.2-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.ResourceMover/1.1.2-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.ResourceMover-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ResourceMover_1.1.1/sdk/resourcemover/Azure.ResourceManager.ResourceMover/)<br>GitHub [1.1.2-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ResourceMover_1.1.2-beta.1/sdk/resourcemover/Azure.ResourceManager.ResourceMover/) |
 | Resource Management - Resources | NuGet [1.7.0](https://www.nuget.org/packages/Azure.ResourceManager.Resources/1.7.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Resources-readme) | GitHub [1.7.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Resources_1.7.0/sdk/resources/Azure.ResourceManager.Resources/) |
 | Resource Management - Security | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.SecurityCenter/1.1.0)<br>NuGet [1.2.0-beta.5](https://www.nuget.org/packages/Azure.ResourceManager.SecurityCenter/1.2.0-beta.5) | [docs](/dotnet/api/overview/azure/ResourceManager.SecurityCenter-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.SecurityCenter_1.1.0/sdk/securitycenter/Azure.ResourceManager.SecurityCenter/)<br>GitHub [1.2.0-beta.5](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.SecurityCenter_1.2.0-beta.5/sdk/securitycenter/Azure.ResourceManager.SecurityCenter/) |

docs/core/diagnostics/built-in-metrics-system-net.md

@@ -105,7 +105,7 @@ Available starting in: .NET 8
 
 | Attribute  | Type | Description  | Examples  | Presence |
 |---|---|---|---|---|
-| `error.type` | string | Request failure reason: one of [HTTP Request errors](https://learn.microsoft.com/dotnet/api/system.net.http.httprequesterror?view=net-8.0), or a full exception type, or an HTTP 4xx/5xx status code. | `System.Threading.Tasks.TaskCanceledException`; `name_resolution_error`; `secure_connection_error` ; `404` | If request has failed. |
+| `error.type` | string | Request failure reason: one of the [HTTP request errors](xref:System.Net.Http.HttpRequestError), or a full exception type, or an HTTP 4xx/5xx status code. | `System.Threading.Tasks.TaskCanceledException`; `name_resolution_error`; `secure_connection_error` ; `404` | If request has failed. |
 | `http.request.method` | string | HTTP request method. | `GET`; `POST`; `HEAD` | Always |
 | `http.response.status_code` | int | [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6). | `200` | If one was received. |
 | `network.protocol.version` | string | Version of the application layer protocol used. | `1.1`; `2` | If response was received. |

docs/core/extensions/dependency-injection-guidelines.md

@@ -207,7 +207,7 @@ For more information, see [Scope validation](dependency-injection.md#scope-valid
 
 When using scoped services, if you're not creating a scope or within an existing scope - the service becomes a singleton.
 
-:::code language="csharp" source="snippets/configuration/di-anti-patterns/Program.cs" id="ScopedServiceBecomesSingleton" highlight="13-14":::
+:::image type="content" source="media/scoped-services-becomes-singleton.png" lightbox="media/scoped-services-becomes-singleton.png" alt-text="Anti-pattern: Scoped service becomes singleton. Do not copy!":::
 
 In the preceding code, `Bar` is retrieved within an <xref:Microsoft.Extensions.DependencyInjection.IServiceScope>, which is correct. The anti-pattern is the retrieval of `Bar` outside of the scope, and the variable is named `avoid` to show which example retrieval is incorrect.
 

docs/core/extensions/logging.md

@@ -270,7 +270,7 @@ The following algorithm is used for each provider when an `ILogger` is created f
 
 ## Log category
 
-When an `ILogger` object is created, a *category* is specified. That category is included with each log message created by that instance of `ILogger`. The category string is arbitrary, but the convention is to use the class name. For example, in an application with a service defined like the following object, the category might be `"Example.DefaultService"`:
+When an `ILogger` object is created, a *category* is specified. That category is included with each log message created by that instance of `ILogger`. The category string is arbitrary, but the convention is to use the fully qualified class name. For example, in an application with a service defined like the following object, the category might be `"Example.DefaultService"`:
 
 ```csharp
 namespace Example
@@ -287,7 +287,7 @@ namespace Example
 }
 ```
 
-To explicitly specify the category, call <xref:Microsoft.Extensions.Logging.LoggerFactory.CreateLogger%2A?displayProperty=nameWithType>:
+If further categorization is desired, the convention is to use a hierarchical name by appending a subcategory to the fully qualified class name, and explicitly specify the category using <xref:Microsoft.Extensions.Logging.LoggerFactory.CreateLogger%2A?displayProperty=nameWithType>:
 
 ```csharp
 namespace Example
@@ -297,7 +297,7 @@ namespace Example
         private readonly ILogger _logger;
 
         public DefaultService(ILoggerFactory loggerFactory) =>
-            _logger = loggerFactory.CreateLogger("CustomCategory");
+            _logger = loggerFactory.CreateLogger("Example.DefaultService.CustomCategory");
 
         // ...
     }