Merge pull request #35251 from dotnet/main

Author: guardrex

aspnetcore/blazor/fundamentals/startup.md

@@ -678,7 +678,7 @@ In a component that adopts Interactive WebAssembly rendering, wrap the component
 
 #### Global Interactive WebAssembly rendering with prerendering
 
-*This scenario applies to global Interactive WebAssembly rendering without prerendering (`@rendermode="InteractiveWebAssembly"` on the `HeadOutlet` and `Routes` components in the `App` component).*
+*This scenario applies to global Interactive WebAssembly rendering with prerendering (`@rendermode="InteractiveWebAssembly"` on the `HeadOutlet` and `Routes` components in the `App` component).*
 
 Create a `ContentLoading` component in the `Layout` folder of the `.Client` app that calls <xref:Microsoft.AspNetCore.Components.RendererInfo.IsInteractive?displayProperty=nameWithType>:
 

aspnetcore/blazor/security/index.md

@@ -535,7 +535,7 @@ Two additional abstractions participate in managing authentication state:
 
 * <xref:Microsoft.AspNetCore.Components.Server.RevalidatingServerAuthenticationStateProvider> ([reference source](https://github.com/dotnet/aspnetcore/blob/main/src/Components/Server/src/Circuits/RevalidatingServerAuthenticationStateProvider.cs)): A base class for <xref:Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider> services used by the Blazor framework to receive an authentication state from the host environment and revalidate it at regular intervals.
 
-  The default 30 minute revalidation interval can be adjusted in [`RevalidatingIdentityAuthenticationStateProvider` (`Areas/Identity/RevalidatingIdentityAuthenticationStateProvider.cs`)](https://github.com/dotnet/aspnetcore/blob/release/7.0/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Areas/Identity/RevalidatingIdentityAuthenticationStateProvider.cs). The following example shortens the interval to 20 minutes:
+  The default 30 minute revalidation interval can be adjusted in [`RevalidatingIdentityAuthenticationStateProvider` (reference source)](https://github.com/dotnet/aspnetcore/blob/v7.0.0/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Areas/Identity/RevalidatingIdentityAuthenticationStateProvider.cs#L26). The following example shortens the interval to 20 minutes:
 
   ```csharp
   protected override TimeSpan RevalidationInterval => TimeSpan.FromMinutes(20);

aspnetcore/fundamentals/openapi/aspnetcore-openapi.md

@@ -150,11 +150,11 @@ The OpenAPI document is regenerated every time a request to the OpenAPI endpoint
 
 ## Generate multiple OpenAPI documents
 
-In some scenarios, it's helpful to generate multiple OpenAPI documents with different content from a single ASP.NET Core API app. These scenarios include:
+In some scenarios, it's helpful to generate multiple OpenAPI documents with different content from a single ASP.NET Core API app. These scenarios include generating OpenAPI documentation for different:
 
-* Generating OpenAPI documentation for different audiences, such as public and internal APIs.
-* Generating OpenAPI documentation for different versions of an API.
-* Generating OpenAPI documentation for different parts of an app, such as a frontend and backend API.
+* Audiences, such as public and internal APIs.
+* Versions of an API.
+* Parts of an app, such as a frontend and backend API.
 
 To generate multiple OpenAPI documents, call the <xref:Microsoft.Extensions.DependencyInjection.OpenApiServiceCollectionExtensions.AddOpenApi%2A> extension method once for each document, specifying a different document name in the first parameter each time.
 

aspnetcore/fundamentals/openapi/include-metadata.md

@@ -12,6 +12,8 @@ uid: fundamentals/openapi/include-metadata
 
 ## Include OpenAPI metadata for endpoints
 
+:::moniker range=">= aspnetcore-10.0"
+
 ASP.NET collects metadata from the web app's endpoints and uses it to generate an OpenAPI document.
 In controller-based apps, metadata is collected from attributes like [`[EndpointDescription]`](xref:Microsoft.AspNetCore.Http.EndpointDescriptionAttribute), [`[HttpPost]`](xref:Microsoft.AspNetCore.Mvc.HttpPostAttribute),
 and [`[Produces]`](xref:Microsoft.AspNetCore.Mvc.ProducesAttribute).
@@ -31,7 +33,7 @@ The following table provides an overview of the metadata collected and the strat
 | responses | [`[Produces]`](xref:Microsoft.AspNetCore.Mvc.ProducesAttribute) | <xref:Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.Produces%2A>, <xref:Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.ProducesProblem%2A> | <xref:Microsoft.AspNetCore.Http.TypedResults> |
 | Excluding endpoints | [`[ExcludeFromDescription]`](xref:Microsoft.AspNetCore.Routing.ExcludeFromDescriptionAttribute), [`[ApiExplorerSettings]`](xref:Microsoft.AspNetCore.Mvc.ApiExplorerSettingsAttribute) | <xref:Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.ExcludeFromDescription%2A> | |
 
-ASP.NET Core does not collect metadata from XML doc comments.
+ASP.NET Core can also collect metadata from XML doc comments. For more information, see <xref:fundamentals/openapi/aspnet-openapi-xml> for more details.
 
 The following sections demonstrate how to include metadata in an app to customize the generated OpenAPI document.
 
@@ -314,8 +316,6 @@ app.MapGet("/todos",
     async (TodoDb db) => await db.Todos.ToListAsync());
 ```
 
-:::moniker range=">= aspnetcore-10.0"
-
 [`[ProducesResponseType]`](xref:Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute), [`[Produces]`](xref:Microsoft.AspNetCore.Mvc.ProducesAttribute), and [`[ProducesDefaultResponseType]`](xref:Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute) also support an optional string property called `Description` that can be used to describe the response. This is useful for explaining why or when clients can expect a specific response:
 
 ```csharp
@@ -327,8 +327,6 @@ app.MapGet("/todos/{id}",
     async (int id, TodoDb db) => /* Code here */);
 ```
 
-:::moniker-end
-
 Using <xref:Microsoft.AspNetCore.Http.TypedResults> in the implementation of an endpoint's route handler automatically includes the response type metadata for the endpoint. For example, the following code automatically annotates the endpoint with a response under the `200` status code with an `application/json` content type.
 
 ```csharp
@@ -398,8 +396,6 @@ Only one [`[Produces]`](xref:Microsoft.AspNetCore.Mvc.ProducesAttribute) or <xre
 
 All of the above attributes can be applied to individual action methods or to the controller class where it applies to all action methods in the controller.
 
-:::moniker range=">= aspnetcore-10.0"
-
 [`[ProducesResponseType]`](xref:Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute), [`[Produces]`](xref:Microsoft.AspNetCore.Mvc.ProducesAttribute), and [`[ProducesDefaultResponseType]`](xref:Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute) also support an optional string property called `Description` that can be used to describe the response. This is useful for explaining why or when clients can expect a specific response:
 
 ```csharp
@@ -412,8 +408,6 @@ All of the above attributes can be applied to individual action methods or to th
 public async Task<ActionResult<Todo>> GetTodoItem(string id, Todo todo)
 ```
 
-:::moniker-end
-
 When not specified by an attribute:
 
 * The status code for the response defaults to 200.
@@ -493,39 +487,6 @@ of the property in the schema.
 
 ### type and format
 
-:::moniker range="< aspnetcore-10.0"
-
-The JSON Schema library maps standard C# types to OpenAPI `type` and `format` as follows:
-
-| C# Type        | OpenAPI `type` | OpenAPI `format` |
-| -------------- | -------------- | ---------------- |
-| int            | integer        | int32            |
-| long           | integer        | int64            |
-| short          | integer        | int16            |
-| byte           | integer        | uint8            |
-| float          | number         | float            |
-| double         | number         | double           |
-| decimal        | number         | double           |
-| bool           | boolean        |                  |
-| string         | string         |                  |
-| char           | string         | char             |
-| byte[]         | string         | byte             |
-| DateTimeOffset | string         | date-time        |
-| DateOnly       | string         | date             |
-| TimeOnly       | string         | time             |
-| Uri            | string         | uri              |
-| Guid           | string         | uuid             |
-| object         | _omitted_      |                  |
-| dynamic        | _omitted_      |                  |
-
-Note that object and dynamic types have _no_ type defined in the OpenAPI because these can contain data of any type, including primitive types like int or string.
-
-The `type` and `format` can also be set with a [Schema Transformer](xref:fundamentals/openapi/customize-openapi#use-schema-transformers). For example, you may want the `format` of decimal types to be `decimal` instead of `double`.
-
-:::moniker-end
-
-:::moniker range=">= aspnetcore-10.0"
-
 #### Numeric types
 
 The JSON Schema library maps standard C# numeric types to OpenAPI `type` and `format` based on the
@@ -593,8 +554,6 @@ Other C# types are represented in the generated OpenAPI document as shown in the
 | object         | _omitted_      |                  |
 | dynamic        | _omitted_      |                  |
 
-:::moniker-end
-
 ### Use attributes to add metadata
 
 ASP.NET uses metadata from attributes on class or record properties to set metadata on the corresponding properties of the generated schema.
@@ -675,13 +634,6 @@ An enum type without a  [`[JsonConverter]`](xref:System.Text.Json.Serialization.
 
 #### nullable
 
-:::moniker range="< aspnetcore-10.0"
-
-Properties defined as a nullable value or reference type have `nullable: true` in the generated schema. This is consistent with the default behavior of the <xref:System.Text.Json> deserializer, which accepts `null` as a valid value for a nullable property.
-
-:::moniker-end
-:::moniker range=">= aspnetcore-10.0"
-
 Properties defined as a nullable value or reference type appear in the generated schema with a `type` keyword whose value is an array that includes `null` as one of the types. This is consistent with the default behavior of the <xref:System.Text.Json> deserializer, which accepts `null` as a valid value for a nullable property.
 
 For example, a C# property defined as `string?` is represented in the generated schema as:
@@ -698,8 +650,6 @@ For example, a C# property defined as `string?` is represented in the generated
 
 If the app is configured to produce OpenAPI v3.0 or OpenAPI v2 documents, nullable value or reference types have `nullable: true` in the generated schema because these OpenAPI versions do not allow the `type` field to be an array.
 
-:::moniker-end
-
 #### additionalProperties
 
 Schemas are generated without an `additionalProperties` assertion by default, which implies the default of `true`. This is consistent with the default behavior of the <xref:System.Text.Json> deserializer, which silently ignores additional properties in a JSON object.
@@ -722,3 +672,9 @@ A schema transformer can be used to override any default metadata or add additio
 
 * <xref:fundamentals/openapi/using-openapi-documents>
 * [OpenAPI specification](https://spec.openapis.org/oas/v3.0.3)
+
+:::moniker-end
+
+[!INCLUDE[](~/fundamentals/openapi/includes/include-metadata9.md)]
+
+:::moniker-end