Merge pull request #34748 from dotnet/main

Merge to Live

Author: Rick-Anderson

aspnetcore/blazor/security/index.md

@@ -368,7 +368,7 @@ Specify the issuer explicitly when deploying to Azure App Service on Linux with
 
 Don't attempt to resolve <xref:Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider> within a custom scope because it results in the creation of a new instance of the <xref:Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider> that isn't correctly initialized.
 
-To access the <xref:Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider> within a service scoped to a component, inject the <xref:Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider> with the [`@inject` directive](xref:mvc/views/razor#inject) or the [`[Inject]` attribute](xref:Microsoft.AspNetCore.Components.InjectAttribute) and pass it to the service as a parameter. This approach ensures that the correct, initialized instance of the <xref:Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider> is used for each user app instance.
+To access the <xref:Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider> within a service scoped to a component, inject the <xref:Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider> into the component and pass it to the service as a parameter. This approach ensures that the correct, initialized instance of the <xref:Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider> is used for each user app instance.
 
 `ExampleService.cs`:
 

aspnetcore/release-notes/aspnetcore-10/includes/openApi.md

@@ -35,45 +35,7 @@ OpenAPI 3.1 support was primarly added in the following [PR](https://github.com/
 
 Support for OpenAPI 3.1 requires an update to the underlying OpenAPI.NET library to a new major version, 2.0. This new version has some breaking changes from the previous version. The breaking changes may impact apps if they have any document, operation, or schema transformers.
 
-One of the most significant changes is that the `OpenApiAny` class has been dropped in favor of using `JsonNode` directly. Transformers that use `OpenApiAny` need to be updated to use `JsonNode`. For example, a schema transformer to add an example in .NET 9 might look like the following code:
-
-```csharp
-    options.AddSchemaTransformer((schema, context, cancellationToken) =>
-    {
-        if (context.JsonTypeInfo.Type == typeof(WeatherForecast))
-        {
-            schema.Example = new OpenApiObject
-            {
-                ["date"] = new OpenApiString(DateTime.Now.AddDays(1).ToString("yyyy-MM-dd")),
-                ["temperatureC"] = new OpenApiInteger(0),
-                ["temperatureF"] = new OpenApiInteger(32),
-                ["summary"] = new OpenApiString("Bracing"),
-            };
-        }
-        return Task.CompletedTask;
-    });
-```
-
-In .NET 10 the transformer to do the same task will look like the following code:
-
-```csharp
-    options.AddSchemaTransformer((schema, context, cancellationToken) =>
-    {
-        if (context.JsonTypeInfo.Type == typeof(WeatherForecast))
-        {
-            schema.Example = new JsonObject
-            {
-                ["date"] = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd"),
-                ["temperatureC"] = 0,
-                ["temperatureF"] = 32,
-                ["summary"] = "Bracing",
-            };
-        }
-        return Task.CompletedTask;
-    });
-```
-
-The following example shows the changes in diff format.
+One of the most significant changes is that the `OpenApiAny` class has been dropped in favor of using `JsonNode` directly. Transformers that use `OpenApiAny` need to be updated to use `JsonNode`. The following diff shows the changes in schema transformer from .NET 9 to .NET 10: 
 
 ```diff
 options.AddSchemaTransformer((schema, context, cancellationToken) =>
@@ -114,4 +76,4 @@ Support for:
 - YAML is currently only available for the the OpenAPI served from the OpenAPI endpoint.
 - Generating OpenAPI documents in YAML format at build time isadded in a future preview.
 
-See [this PR](https://github.com/dotnet/aspnetcore/pull/58616) which added support for serving the generated OpenAPI document in YAML format.
+See [this PR](https://github.com/dotnet/aspnetcore/pull/58616) which added support for serving the generated OpenAPI document in YAML format.