Merge pull request #34581 from dotnet/main

Merge to Live

Author: Rick-Anderson

aspnetcore/data/ef-mvc/advanced.md

@@ -256,6 +256,8 @@ For information on how to deploy a web app, see <xref:host-and-deploy/index>.
 
 For information about other topics related to ASP.NET Core MVC, such as authentication and authorization, see <xref:index>.
 
+[!INCLUDE[](~/includes/reliableWAP.md)]
+
 ## Next steps
 
 In this tutorial, you:

aspnetcore/data/ef-rp/concurrency.md

@@ -445,6 +445,8 @@ The browser shows the Index page with the changed value and updated `Concurrency
 
 Delete the test department from the second tab. A concurrency error is display with the current values from the database. Clicking **Delete** deletes the entity, unless `ConcurrencyToken` has been updated.
 
+[!INCLUDE[](~/includes/reliableWAP_H2.md)]
+
 ## Additional resources
 
 * [Concurrency Tokens in EF Core](/ef/core/modeling/concurrency)
@@ -800,6 +802,8 @@ The browser shows the Index page with the changed value and updated rowVersion i
 
 Delete the test department from the second tab. A concurrency error is display with the current values from the database. Clicking **Delete** deletes the entity, unless `RowVersion` has been updated.
 
+[!INCLUDE[](~/includes/reliableWAP.md)]
+
 ## Additional resources
 
 * [Concurrency Tokens in EF Core](/ef/core/modeling/concurrency)
@@ -1100,7 +1104,9 @@ Delete the test department from the second tab. A concurrency error is display w
 
 See [Inheritance](xref:data/ef-mvc/inheritance) on how to inherit a data model.
 
-### Additional resources
+[!INCLUDE[](~/includes/reliableWAP_H2.md)]
+
+## Additional resources
 
 * [Concurrency Tokens in EF Core](/ef/core/modeling/concurrency)
 * [Handle concurrency in EF Core](/ef/core/saving/concurrency)

aspnetcore/fundamentals/servers/index.md

@@ -266,6 +266,8 @@ A `launchSettings.json` file provides configuration when launching an app with `
 
 An HTTP/2 connection must use [Application-Layer Protocol Negotiation (ALPN)](https://tools.ietf.org/html/rfc7301#section-3) and TLS 1.2 or later. For more information, see the topics that pertain to your server deployment scenarios.
 
+[!INCLUDE[](~/includes/reliableWAP_H2.md)]
+
 ## Additional resources
 
 * <xref:fundamentals/servers/kestrel>

aspnetcore/includes/reliableWAP.md

@@ -1 +1 @@
-See *The Reliable Web App Pattern for.NET* [YouTube videos](https://www.youtube.com/watch?v=tU2kYzB3noM) and [article](/azure/architecture/reference-architectures/reliable-web-app/dotnet/pattern-overview) for guidance on creating a modern, reliable, performant, testable, cost-efficient, and scalable ASP.NET Core app, whether from scratch or refactoring an existing app.
+For guidance on creating a reliable, secure, performant, testable, and scalable ASP.NET Core app, see [Enterprise web app patterns](/azure/architecture/web-apps/guides/enterprise-app-patterns/overview). A complete production-quality sample web app that implements the patterns is available.

aspnetcore/includes/reliableWAP_H2.md

@@ -1,3 +1,3 @@
-## Reliable web app patterns
+## Enterprise web app patterns
 
 [!INCLUDE[](~/includes/reliableWAP.md)]

aspnetcore/security/index.md

@@ -81,6 +81,8 @@ For information on other cloud providers, see:
 * [AWS (Amazon Web Services): AWS Key Management Service (KMS)](https://aws.amazon.com/kms/)
 * [Google Cloud Key Management Service overview](https://cloud.google.com/kms/docs/key-management-service)
 
+[!INCLUDE[](~/includes/reliableWAP_H2.md)]
+
 ## Additional resources
 
 * <xref:security/authentication/identity>

aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Models/Movie.cs

@@ -117,16 +117,15 @@ public class Movie
 {
     public int Id { get; set; }
     [StringLength(60, MinimumLength = 3)]
-    public string Title { get; set; }
+    public string? Title { get; set; }
     [Display(Name = "Release Date"), DataType(DataType.Date)]
     public DateTime ReleaseDate { get; set; }
     [RegularExpression(@"^[A-Z]+[a-zA-Z\s]*$"), Required, StringLength(30)]
-    public string Genre { get; set; }
-    [Range(1, 100), DataType(DataType.Currency)]
-    [Column(TypeName = "decimal(18, 2)")]
+    public string? Genre { get; set; }
+    [Range(1, 100), DataType(DataType.Currency), Column(TypeName = "decimal(18, 2)")]
     public decimal Price { get; set; }
     [RegularExpression(@"^[A-Z]+[a-zA-Z0-9""'\s-]*$"), StringLength(5)]
-    public string Rating { get; set; }
+    public string? Rating { get; set; }
 }
 // </snippet_AttrOneLine>
 #endif