Skip to content

Commit 9d0b4ed

Browse files
authored
Merge pull request #35044 from dotnet/main
2 parents 061744d + 77f69b3 commit 9d0b4ed

File tree

10 files changed

+276
-26
lines changed

10 files changed

+276
-26
lines changed

aspnetcore/blazor/images-and-documents.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ The following `ShowImage2` component:
157157

158158
The following `ShowFile` component loads either a text file (`files/quote.txt`) or a PDF file (`files/quote.pdf`) into an [`<iframe>` element](https://developer.mozilla.org/docs/Web/HTML/Element/iframe).
159159

160-
> [!CAUTION]
161-
> ⚠️ Use of the `<iframe>` element in the following example is safe and doesn't require [sandboxing](https://developer.mozilla.org/docs/Web/HTML/Element/iframe#sandbox) because content is loaded from the app, which is a trusted source.
160+
> [!WARNING]
161+
> Use of the `<iframe>` element in the following example is safe and doesn't require [sandboxing](https://developer.mozilla.org/docs/Web/HTML/Element/iframe#sandbox) because content is loaded from the app, which is a trusted source.
162162
>
163163
> When loading content from an untrusted source or user input, an improperly implemented `<iframe>` element risks creating security vulnerabilities.
164164

aspnetcore/blazor/security/blazor-web-app-with-entra.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ The following specification is covered:
120120

121121
For more information on .NET Aspire, see [General Availability of .NET Aspire: Simplifying .NET Cloud-Native Development (May, 2024)](https://devblogs.microsoft.com/dotnet/dotnet-aspire-general-availability/).
122122

123-
## Prerequisite
123+
## Prerequisites
124124

125125
[.NET Aspire](/dotnet/aspire/get-started/aspire-overview) requires [Visual Studio](https://visualstudio.microsoft.com/) version 17.10 or later.
126126

aspnetcore/blazor/security/blazor-web-app-with-oidc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ The following specification is covered:
453453

454454
For more information on .NET Aspire, see [General Availability of .NET Aspire: Simplifying .NET Cloud-Native Development (May, 2024)](https://devblogs.microsoft.com/dotnet/dotnet-aspire-general-availability/).
455455

456-
## Prerequisite
456+
## Prerequisites
457457

458458
[.NET Aspire](/dotnet/aspire/get-started/aspire-overview) requires [Visual Studio](https://visualstudio.microsoft.com/) version 17.10 or later.
459459

aspnetcore/blazor/security/content-security-policy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Blazor Web Apps (.NET 8 or later) automatically include a response header settin
166166
Content-Security-Policy: frame-ancestors 'self'
167167
```
168168

169-
To change the default value to the more restrictive `'none'` and prevent all parents from embedding the app, set the <xref:Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ContentSecurityFrameAncestorsPolicy%2A> option in the call to <xref:Microsoft.AspNetCore.Builder.ServerRazorComponentsEndpointConventionBuilderExtensions.AddInteractiveServerRenderMode%2A> in the `Program` file. The following only takes effect when WebSocket compression is enabled (`<xref:Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ConfigureWebSocketAcceptContext%2A>` is set, which is the default for Blazor apps).
169+
To change the default value to the more restrictive `'none'` and prevent all parents from embedding the app, set the <xref:Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ContentSecurityFrameAncestorsPolicy%2A> option in the call to <xref:Microsoft.AspNetCore.Builder.ServerRazorComponentsEndpointConventionBuilderExtensions.AddInteractiveServerRenderMode%2A> in the `Program` file. The following only takes effect when WebSocket compression is enabled (<xref:Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ConfigureWebSocketAcceptContext> is set, which is the default for Blazor apps).
170170

171171
```csharp
172172
.AddInteractiveServerRenderMode(o => o.ContentSecurityFrameAncestorsPolicy = "'none'")
@@ -399,8 +399,8 @@ Subresource Integrity (SRI) enables browsers to confirm that fetched resources a
399399

400400
In the following example for a Blazor Server app, an integrity is calculated using a third-party tool and specified for the Blazor script (`blazor.server.js`) and CSP. The Blazor script doesn't dynamically change in this scenario and has a stable SHA hash, so you can hardcode the `integrity` attribute's value.
401401

402-
> [!CAUTION]
403-
> ⚠️ Set the [`crossorigin` attribute](https://developer.mozilla.org/docs/Web/HTML/Attributes/crossorigin) on a subresource that's loaded from a different origin without [Cross-Origin Resource Sharing (CORS)](xref:security/cors). If the app's origin is different from where a subresource loads, an `Access-Control-Allow-Origin` header is required that allows the resource to be shared with the requesting origin *or else* the `crossorigin` attribute must be applied to the subresource's tag in the app. Otherwise, the browser adopts the 'fail-open' policy for the subresource, which means the subresource is loaded without checking its integrity.
402+
> [!WARNING]
403+
> Set the [`crossorigin` attribute](https://developer.mozilla.org/docs/Web/HTML/Attributes/crossorigin) on a subresource that's loaded from a different origin without [Cross-Origin Resource Sharing (CORS)](xref:security/cors). If the app's origin is different from where a subresource loads, an `Access-Control-Allow-Origin` header is required that allows the resource to be shared with the requesting origin *or else* the `crossorigin` attribute must be applied to the subresource's tag in the app. Otherwise, the browser adopts the 'fail-open' policy for the subresource, which means the subresource is loaded without checking its integrity.
404404
>
405405
> The `crossorigin` attribute isn't added to the Blazor `<script>` tag in the following example because the Blazor script is loaded from the app's origin.
406406
>

aspnetcore/blazor/tutorials/movie-database-app/part-7.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,8 @@ To delete all of the records in the database, use one of the following approache
358358

359359
:::zone-end
360360

361-
> [!CAUTION]
362-
> ⚠️ Use extreme caution when deleting records from a database. Deleting records is permanent without taking additional data loss mitigation steps. Production databases often provision automatic backup copies of data, either instantaneously as the database is modified or periodically, including with off-site copies and permanent physical storage of data.
361+
> [!WARNING]
362+
> Use extreme caution when deleting records from a database. Deleting records is permanent without taking additional data loss mitigation steps. Production databases often provision automatic backup copies of data, either instantaneously as the database is modified or periodically, including with off-site copies and permanent physical storage of data.
363363
364364
After deleting all of the records, run the app. The initializer reseeds the database and includes the correct movie ratings for the `Rating` field based on the seeding code.
365365

aspnetcore/fundamentals/openapi/include-metadata.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,10 +379,9 @@ When not specified by an attribute:
379379
* the schema for the response body of 3xx and 5xx responses is considered to be not specified,
380380
* the content-type for the response body can be inferred from the return type of the action method and the set of output formatters.
381381
382-
Note that there are no compile-time checks to ensure that the response metadata specified with a [`[ProducesResponseType]`](xref:Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute) attribute is consistent with the actual behavior of the action method,
383-
which may return a different status code or response body type than specified by the metadata.
382+
By default, there are no compile-time checks to ensure that the response metadata specified with a [`[ProducesResponseType]` attribute](xref:Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute) is consistent with the actual behavior of the action method, which may return a different status code or response body type than specified by the metadata. To enable these checks, [enable Web API analyzers](xref:web-api/advanced/analyzers).
384383
385-
In controller-based apps, ASP.NET responds with a ProblemDetails response type when model validation fails or when the action method returns a result with a 4xx or 5xx HTTP status code. Validation errors typically use the 400 status code, so you can use the [`[ProducesResponseType]`](xref:Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute) attribute to specify the error response for an action, as shown in the following example:
384+
In controller-based apps, ASP.NET responds with a ProblemDetails response type when model validation fails or when the action method returns a result with a 4xx or 5xx HTTP status code. Validation errors typically use the 400 status code, so you can use the [`[ProducesResponseType]` attribute](xref:Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute) to specify the error response for an action, as shown in the following example:
386385
387386
```csharp
388387
[HttpPut("/todos/{id}")]
@@ -541,7 +540,7 @@ public enum DayOfTheWeekAsString
541540
}
542541
```
543542
544-
A special case is when an enum type has the [Flags] attribute, which indicates that the enum can be treated as a bit field; that is, a set of flags. A flags enum with a [JsonConverterAttribute] will be defined as `type: string` in the generated schema with no `enum` property, since the value could be any combination of the enum values. For example, the following enum:
543+
A special case is when an enum type has the `[Flags]` attribute, which indicates that the enum can be treated as a bit field; that is, a set of flags. A flags enum with a `[JsonConverterAttribute]` is defined as `type: string` in the generated schema with no `enum` property, since the value could be any combination of the enum values. For example, the following enum:
545544
546545
```csharp
547546
[Flags, JsonConverter(typeof(JsonStringEnumConverter<PizzaToppings>))]

aspnetcore/signalr/client-features.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ The 1.x versions of SignalR map to the 2.1 and 2.2 .NET Core releases and have t
2929

3030
The table below shows the features and support for the clients that offer real-time support. For each feature, the *minimum* version supporting this feature is listed. If no version is listed, the feature isn't supported.
3131

32-
| Feature | Server | .NET client | JavaScript client | Java client |
33-
| ---- | :-: | :-: | :-: | :-: |
34-
| Azure SignalR Service Support |2.1.0|1.0.0|1.0.0|1.0.0|
35-
| [Server-to-client Streaming](xref:signalr/streaming) |2.1.0|1.0.0|1.0.0|1.0.0|
36-
| [Client-to-server Streaming](xref:signalr/streaming) |3.0.0|3.0.0|3.0.0|3.0.0|
37-
| Automatic Reconnection ([.NET](xref:signalr/dotnet-client#handle-lost-connection), [JavaScript](xref:signalr/javascript-client#reconnect-clients)) |3.0.0|3.0.0|3.0.0||
38-
| WebSockets Transport |2.1.0|1.0.0|1.0.0|1.0.0|
39-
| Server-Sent Events Transport |2.1.0|1.0.0|1.0.0||
40-
| Long Polling Transport |2.1.0|1.0.0|1.0.0|3.0.0|
41-
| JSON Hub Protocol |2.1.0|1.0.0|1.0.0|1.0.0|
42-
| MessagePack Hub Protocol |2.1.0|1.0.0|1.0.0|5.0.0|
43-
| Client Results |7.0.0|7.0.0|7.0.0|7.0.0|
32+
| Feature | Server | .NET client | JavaScript client | Java client | Swift client |
33+
| ---- | :-: | :-: | :-: | :-: | :-: |
34+
| Azure SignalR Service Support |2.1.0|1.0.0|1.0.0|1.0.0|1.0.0-preview.1|
35+
| [Server-to-client Streaming](xref:signalr/streaming) |2.1.0|1.0.0|1.0.0|1.0.0|1.0.0-preview.1|
36+
| [Client-to-server Streaming](xref:signalr/streaming) |3.0.0|3.0.0|3.0.0|3.0.0||
37+
| Automatic Reconnection ([.NET](xref:signalr/dotnet-client#handle-lost-connection), [JavaScript](xref:signalr/javascript-client#reconnect-clients)) |3.0.0|3.0.0|3.0.0||1.0.0-preview.1|
38+
| WebSockets Transport |2.1.0|1.0.0|1.0.0|1.0.0|1.0.0-preview.1|
39+
| Server-Sent Events Transport |2.1.0|1.0.0|1.0.0||1.0.0-preview.1|
40+
| Long Polling Transport |2.1.0|1.0.0|1.0.0|3.0.0|1.0.0-preview.1|
41+
| JSON Hub Protocol |2.1.0|1.0.0|1.0.0|1.0.0|1.0.0-preview.1|
42+
| MessagePack Hub Protocol |2.1.0|1.0.0|1.0.0|5.0.0|1.0.0-preview.1|
43+
| Client Results |7.0.0|7.0.0|7.0.0|7.0.0|1.0.0-preview.1|
4444

4545
Support for enabling additional client features is tracked in [our issue tracker](https://github.com/dotnet/AspNetCore/issues).
4646

aspnetcore/signalr/supported-platforms.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,15 @@ If the server runs IIS, the WebSockets transport requires IIS 8.0 or later on Wi
3939

4040
The [Java client](xref:signalr/java-client) supports Java 8 and later versions.
4141

42+
## Swift client
43+
44+
The [Swift client](https://github.com/dotnet/signalr-client-swift) supports Swift >= 5.10
45+
4246
## Unsupported clients
4347

4448
The following clients are available but are experimental or unofficial. The following clients aren't currently supported and may never be supported:
4549

4650
* [C++ client](https://github.com/aspnet/SignalR-Client-Cpp)
47-
* [Swift client](https://github.com/moozzyk/SignalR-Client-Swift)
51+
* [3rd party Swift client](https://github.com/moozzyk/SignalR-Client-Swift)
4852

4953
[!INCLUDE[](~/includes/SignalR/es6.md)]

0 commit comments

Comments
 (0)