From c6d4c52f7fa0b4a840892f1080f69d3da0171fe7 Mon Sep 17 00:00:00 2001
From: Deep Choudhery <decho@microsoft.com>
Date: Mon, 28 Oct 2024 15:07:32 -0700
Subject: [PATCH 1/2] checking and fixing for RequiredAttribute in model
 classes

---
 .../VS.Web.CG.EFCore/IPropertyExtensions.cs   |  3 +-
 .../VS.Web.CG.EFCore/IPropertyMetadata.cs     |  1 +
 .../VS.Web.CG.EFCore/PropertyMetadata.cs      |  1 +
 .../VS.Web.CG.Mvc/Templates/Blazor/Create.cs  |  7 +-
 .../VS.Web.CG.Mvc/Templates/Blazor/Create.tt  |  5 +-
 .../VS.Web.CG.Mvc/Templates/Blazor/Edit.cs    |  8 ++-
 .../VS.Web.CG.Mvc/Templates/Blazor/Edit.tt    |  5 +-
 .../Bootstrap5/Create.cshtml                  | 70 ++++++++++---------
 .../RazorPageGenerator/Bootstrap5/Edit.cshtml |  8 ++-
 .../Extensions/PropertySymbolExtensions.cs    | 17 +++++
 .../Templates/BlazorCrud/Create.cs            |  8 ++-
 .../Templates/BlazorCrud/Create.tt            |  6 +-
 .../Templates/BlazorCrud/Edit.cs              |  9 ++-
 .../Templates/BlazorCrud/Edit.tt              |  6 +-
 .../Templates/RazorPages/Create.cs            |  7 +-
 .../Templates/RazorPages/Create.tt            |  5 +-
 .../Templates/RazorPages/Edit.cs              |  7 +-
 .../Templates/RazorPages/Edit.tt              |  5 +-
 18 files changed, 122 insertions(+), 56 deletions(-)
 create mode 100644 src/dotnet-scaffolding/dotnet-scaffold-aspnet/Extensions/PropertySymbolExtensions.cs

diff --git a/src/Scaffolding/VS.Web.CG.EFCore/IPropertyExtensions.cs b/src/Scaffolding/VS.Web.CG.EFCore/IPropertyExtensions.cs
index 06a081b93..4381d2d74 100644
--- a/src/Scaffolding/VS.Web.CG.EFCore/IPropertyExtensions.cs
+++ b/src/Scaffolding/VS.Web.CG.EFCore/IPropertyExtensions.cs
@@ -29,7 +29,7 @@ internal static IPropertyMetadata ToPropertyMetadata(this IProperty property, Ty
             propertyMetadata.IsReadOnly = property.GetBeforeSaveBehavior() != PropertySaveBehavior.Save;
 
             propertyMetadata.IsAutoGenerated = property.ValueGenerated != ValueGenerated.Never || property.GetValueGeneratorFactory() != null;
-
+            
             propertyMetadata.ShortTypeName = TypeUtil.GetShortTypeName(property.ClrType);
 
             propertyMetadata.Scaffold = true;
@@ -45,6 +45,7 @@ internal static IPropertyMetadata ToPropertyMetadata(this IProperty property, Ty
 
                 var dataTypeAttr = reflectionProperty.GetCustomAttribute(typeof(DataTypeAttribute)) as DataTypeAttribute;
                 propertyMetadata.IsMultilineText = (dataTypeAttr != null) && (dataTypeAttr.DataType == DataType.MultilineText);
+                propertyMetadata.IsRequired = reflectionProperty.GetCustomAttribute(typeof(RequiredAttribute)) is not null;
             }
 
             propertyMetadata.IsEnumFlags = false;
diff --git a/src/Scaffolding/VS.Web.CG.EFCore/IPropertyMetadata.cs b/src/Scaffolding/VS.Web.CG.EFCore/IPropertyMetadata.cs
index 48a005352..b1e742513 100644
--- a/src/Scaffolding/VS.Web.CG.EFCore/IPropertyMetadata.cs
+++ b/src/Scaffolding/VS.Web.CG.EFCore/IPropertyMetadata.cs
@@ -18,6 +18,7 @@ public interface IPropertyMetadata
         string ShortTypeName { get; set; }
         string TypeName { get; set; }
         bool IsMultilineText { get; set; }
+        public bool IsRequired { get; set; }
 
         PropertyInfo PropertyInfo { get; set; }
     }
diff --git a/src/Scaffolding/VS.Web.CG.EFCore/PropertyMetadata.cs b/src/Scaffolding/VS.Web.CG.EFCore/PropertyMetadata.cs
index 9246cf5fc..872931037 100644
--- a/src/Scaffolding/VS.Web.CG.EFCore/PropertyMetadata.cs
+++ b/src/Scaffolding/VS.Web.CG.EFCore/PropertyMetadata.cs
@@ -73,5 +73,6 @@ public PropertyMetadata(PropertyInfo property)
         public bool IsMultilineText { get; set; }
 
         public PropertyInfo PropertyInfo { get; set; }
+        public bool IsRequired { get; set; }
     }
 }
diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs
index af62f072e..97483d14e 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs
@@ -59,7 +59,7 @@ public virtual string TransformText()
             this.Write("\" OnValidSubmit=\"Add");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write("\" FormName=\"create\" Enhance>\r\n            <DataAnnotationsValidator />\r\n         " +
-                    "   <ValidationSummary class=\"text-danger\" />\r\n            ");
+                    "   <ValidationSummary class=\"text-danger\" role=\"alert\"/>\r\n            ");
 
                 foreach (var property in entityProperties)
                 {
@@ -68,6 +68,7 @@ public virtual string TransformText()
                     string propertyShortTypeName = property.ShortTypeName.Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
+                    var requiredHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
             
             this.Write("<div class=\"mb-3\">\r\n                <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
@@ -83,7 +84,9 @@ public virtual string TransformText()
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
-            this.Write("\" /> \r\n                <ValidationMessage For=\"() => ");
+            this.Write("\" ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredHtml));
+            this.Write("/> \r\n                <ValidationMessage For=\"() => ");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.tt b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.tt
index 9bde14021..d4fb8f4ae 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.tt
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.tt
@@ -35,7 +35,7 @@
     <div class="col-md-4">
         <EditForm method="post" Model="<#= modelName #>" OnValidSubmit="Add<#= modelName #>" FormName="create" Enhance>
             <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" />
+            <ValidationSummary class="text-danger" role="alert"/>
             <#
                 foreach (var property in entityProperties)
                 {
@@ -44,10 +44,11 @@
                     string propertyShortTypeName = property.ShortTypeName.Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
+                    var requiredHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
             #>
 <div class="mb-3">
                 <label for="<#= modelPropertyNameLowercase #>" class="form-label"><#= modelPropertyName #>:</label> 
-                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" /> 
+                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredHtml #>/> 
                 <ValidationMessage For="() => <#= modelName #>.<#= modelPropertyName #>" class="text-danger" /> 
             </div>        
             <#  } #>
diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.cs b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.cs
index d7821bd9f..f7d47b8b6 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.cs
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.cs
@@ -65,7 +65,8 @@ public virtual string TransformText()
             this.Write("\" OnValidSubmit=\"Update");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write("\" FormName=\"edit\" Enhance>\r\n                <DataAnnotationsValidator />\r\n       " +
-                    "         <ValidationSummary />\r\n                <input type=\"hidden\" name=\"");
+                    "         <ValidationSummary role=\"alert\"/>\r\n                <input type=\"hidden\"" +
+                    " name=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");
             this.Write(this.ToStringHelper.ToStringWithCulture(primaryKeyName));
@@ -82,6 +83,7 @@ public virtual string TransformText()
                     string propertyShortTypeName = property.ShortTypeName.Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
+                    var requiredHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
 
             this.Write("                <div class=\"mb-3\">\r\n                    <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
@@ -97,7 +99,9 @@ public virtual string TransformText()
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
-            this.Write("\" />\r\n                    <ValidationMessage For=\"() => ");
+            this.Write("\" ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredHtml));
+            this.Write("/>\r\n                    <ValidationMessage For=\"() => ");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.tt b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.tt
index 3eb03a18e..493426d5b 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.tt
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.tt
@@ -45,7 +45,7 @@ else
         <div class="col-md-4">
             <EditForm method="post" Model="<#= modelName #>" OnValidSubmit="Update<#= modelName #>" FormName="edit" Enhance>
                 <DataAnnotationsValidator />
-                <ValidationSummary />
+                <ValidationSummary role="alert"/>
                 <input type="hidden" name="<#= modelName #>.<#= primaryKeyName #>" value="@<#= modelName #>.<#= primaryKeyName #>" />
 <#
                 foreach (var property in entityProperties)
@@ -55,10 +55,11 @@ else
                     string propertyShortTypeName = property.ShortTypeName.Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
+                    var requiredHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
 #>
                 <div class="mb-3">
                     <label for="<#= modelPropertyNameLowercase #>" class="form-label"><#= modelPropertyName #>:</label>
-                    <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" />
+                    <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredHtml #>/>
                     <ValidationMessage For="() => <#= modelName #>.<#= modelPropertyName #>" class="text-danger" />
                 </div>
 <#  } #>
diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Create.cshtml b/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Create.cshtml
index affa4b8b3..57e127100 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Create.cshtml
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Create.cshtml
@@ -1,4 +1,4 @@
-@inherits Microsoft.VisualStudio.Web.CodeGeneration.Templating.RazorTemplateBase
+@inherits Microsoft.VisualStudio.Web.CodeGeneration.Templating.RazorTemplateBase
 @using Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore
 @using System.Collections.Generic
 @using System.Linq
@@ -11,47 +11,49 @@
     }
     else if (Model.IsLayoutPageSelected)
     {
-@:@@{
-    @:ViewData["Title"] = "@Model.RazorPageName";
+        @:@@{
+        @:ViewData["Title"] = "@Model.RazorPageName";
         if (!string.IsNullOrEmpty(Model.LayoutPageFile))
         {
-    @:Layout = "@Model.LayoutPageFile";
+            @:Layout = "@Model.LayoutPageFile";
         }
-@:}
-@:
-@:<h1>@Model.RazorPageName</h1>
-@:
+        @:}
+        @:
+        @:<h1>@Model.RazorPageName</h1>
+        @:
     }
     else
     {
-@:@@{
-    @:Layout = null;
-@:}
-@:
-@:<!DOCTYPE html>
-@:
-@:<html>
-@:<head>
-    @:<meta name="viewport" content="width=device-width" />
-    @:<title>@Model.RazorPageName</title>
-@:</head>
-@:<body>
-@:
+        @:@@{
+        @:Layout = null;
+        @:}
+        @:
+        @:<!DOCTYPE html>
+        @:
+        @:<html>
+        @:<head>
+        @:<meta name="viewport" content="width=device-width" />
+        @:<title>@Model.RazorPageName</title>
+        @:</head>
+        @:<body>
+        @:
         //    PushIndent("    ");
     }
-@:<h4>@Model.ViewDataTypeShortName</h4>
-@:<hr />
-@:<div class="row">
+    @:<h4>@Model.ViewDataTypeShortName</h4>
+    @:<hr />
+    @:<div class="row">
     @:<div class="col-md-4">
-        @:<form method="post">
-            @:<div asp-validation-summary="ModelOnly" class="text-danger"></div>
-        foreach (var property in Model.ModelMetadata.Properties)
-        {
-            if (property.Scaffold && !property.IsAutoGenerated && !property.IsReadOnly)
+    @:<form method="post">
+    @:<div asp-validation-summary="ModelOnly" class="text-danger"></div>
+    foreach (var property in Model.ModelMetadata.Properties)
+    {
+        var sixteenWhitespace = new string(' ', 16);
+        var propertyRequiredText = property.IsRequired ? $"\n{sixteenWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
+        if (property.Scaffold && !property.IsAutoGenerated && !property.IsReadOnly)
             {
                 if (property.IsForeignKey)
                 {
-            @:<div class="form-group">
+            @:<div class="form-group">@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName).@property.PropertyName" class="control-label"></label>
                 @:<select asp-for="@(Model.ModelTypeName).@property.PropertyName" class ="form-control" asp-items="ViewBag.@property.PropertyName"></select>
             @:</div>
@@ -61,7 +63,7 @@
                 bool isCheckbox = property.TypeName.Equals("System.Boolean");
                 if (isCheckbox)
                 {
-            @:<div class="form-group form-check">
+            @:<div class="form-group form-check">@propertyRequiredText
                 @:<label class="form-check-label">
                     @:<input class="form-check-input" asp-for="@(Model.ModelTypeName).@property.PropertyName" /> @@Html.DisplayNameFor(model => model.@(Model.ModelTypeName).@GetValueExpression(property))
                 @:</label>
@@ -69,7 +71,7 @@
                 }
                 else if (property.IsEnum && !property.IsEnumFlags)
                 {
-            @:<div class="form-group">
+            @:<div class="form-group">@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName).@property.PropertyName" class="control-label"></label>
                 @:<select asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control"></select>
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
@@ -77,7 +79,7 @@
                 }
                 else if (property.IsMultilineText)
                 {
-            @:<div class="form-group">
+            @:<div class="form-group">@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName).@property.PropertyName" class="control-label"></label>
                 @:<textarea asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control"></textarea>
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
@@ -85,7 +87,7 @@
                 }
                 else
                 {
-            @:<div class="form-group">
+            @:<div class="form-group">@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName).@property.PropertyName" class="control-label"></label>
                 @:<input asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control" />
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Edit.cshtml b/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Edit.cshtml
index 706798c72..e2d5109ce 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Edit.cshtml
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Edit.cshtml
@@ -1,4 +1,4 @@
-@inherits Microsoft.VisualStudio.Web.CodeGeneration.Templating.RazorTemplateBase
+@inherits Microsoft.VisualStudio.Web.CodeGeneration.Templating.RazorTemplateBase
 @using Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore
 @using System.Collections.Generic
 @using System.Linq
@@ -47,6 +47,7 @@
             @:<div asp-validation-summary="ModelOnly" class="text-danger"></div>
         foreach (PropertyMetadata property in Model.ModelMetadata.Properties)
         {
+            var propertyRequiredText = property.IsRequired ? "<span class=\"text-danger\">*</span>" : string.Empty;
             if (property.IsPrimaryKey)
             {
             @:<input type="hidden" asp-for="@(Model.ModelTypeName).@property.PropertyName" />
@@ -63,6 +64,7 @@
                 if (property.IsForeignKey)
                 {
             @:<div class="form-group">
+                @:@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName).@property.PropertyName" class="control-label"></label>
                 @:<select asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control" asp-items="ViewBag.@property.PropertyName"></select>
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
@@ -74,6 +76,7 @@
                 if (isCheckbox)
                 {
             @:<div class="form-group form-check">
+                @:@propertyRequiredText
                 @:<label class="form-check-label">
                     @:<input class="form-check-input" asp-for="@(Model.ModelTypeName).@property.PropertyName" /> @@Html.DisplayNameFor(model => model.@(Model.ModelTypeName).@GetValueExpression(property))
                 @:</label>
@@ -82,6 +85,7 @@
                 else if (property.IsEnum && !property.IsEnumFlags)
                 {
             @:<div class="form-group">
+                @:@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName).@property.PropertyName" class="control-label"></label>
                 @:<select asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control"></select>
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
@@ -90,6 +94,7 @@
                 else if (property.IsMultilineText)
                 {
             @:<div class="form-group">
+                @:@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName).@property.PropertyName" class="control-label"></label>
                 @:<textarea asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control"></textarea>
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
@@ -98,6 +103,7 @@
                 else
                 {
             @:<div class="form-group">
+                @:@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName).@property.PropertyName" class="control-label"></label>
                 @:<input asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control" />
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Extensions/PropertySymbolExtensions.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Extensions/PropertySymbolExtensions.cs
new file mode 100644
index 000000000..8ebbfb31b
--- /dev/null
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Extensions/PropertySymbolExtensions.cs
@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.DotNet.Tools.Scaffold.AspNet.Extensions;
+
+internal static class PropertySymbolExtensions
+{
+    public static bool HasRequiredAttribute(this IPropertySymbol propertySymbol)
+    {
+        return propertySymbol.GetAttributes().FirstOrDefault(
+            x => x.AttributeClass is not null &&
+            x.AttributeClass.Name.Equals(nameof(RequiredAttribute), StringComparison.OrdinalIgnoreCase)) is not null;
+    }
+}
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs
index e2f1017ba..c04d2f65b 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs
@@ -12,6 +12,7 @@ namespace Microsoft.DotNet.Tools.Scaffold.AspNet.Templates.BlazorCrud
     using System.Collections.Generic;
     using System.Text;
     using System.Linq;
+    using Microsoft.DotNet.Tools.Scaffold.AspNet.Extensions;
     using System;
     
     /// <summary>
@@ -60,7 +61,7 @@ public virtual string TransformText()
             this.Write("\" OnValidSubmit=\"Add");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write("\" FormName=\"create\" Enhance>\r\n            <DataAnnotationsValidator />\r\n         " +
-                    "   <ValidationSummary class=\"text-danger\" />\r\n            ");
+                    "   <ValidationSummary class=\"text-danger\" role=\"alert\"/>\r\n            ");
 
                 foreach (var property in entityProperties)
                 {
@@ -69,6 +70,7 @@ public virtual string TransformText()
                     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
+                    var requiredHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
             
             this.Write("<div class=\"mb-3\">\r\n                <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
@@ -84,7 +86,9 @@ public virtual string TransformText()
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
-            this.Write("\" /> \r\n                <ValidationMessage For=\"() => ");
+            this.Write("\" ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredHtml));
+            this.Write("/> \r\n                <ValidationMessage For=\"() => ");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt
index a4eb489df..a6b0a73fe 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt
@@ -3,6 +3,7 @@
 <#@  import namespace="System.Collections.Generic" #>
 <#@  import namespace="System.Text" #>
 <#@  import namespace="System.Linq" #>
+<#@  import namespace="Microsoft.DotNet.Tools.Scaffold.AspNet.Extensions" #>
 <#
     string modelName = Model.ModelInfo.ModelTypeName;
     string pluralModel = Model.ModelInfo.ModelTypePluralName;
@@ -36,7 +37,7 @@
     <div class="col-md-4">
         <EditForm method="post" Model="<#= modelName #>" OnValidSubmit="Add<#= modelName #>" FormName="create" Enhance>
             <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" />
+            <ValidationSummary class="text-danger" role="alert"/>
             <#
                 foreach (var property in entityProperties)
                 {
@@ -45,10 +46,11 @@
                     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
+                    var requiredHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
             #>
 <div class="mb-3">
                 <label for="<#= modelPropertyNameLowercase #>" class="form-label"><#= modelPropertyName #>:</label> 
-                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" /> 
+                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredHtml #>/> 
                 <ValidationMessage For="() => <#= modelName #>.<#= modelPropertyName #>" class="text-danger" /> 
             </div>        
             <#  } #>
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.cs
index e2360f2a2..c84ae7700 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.cs
@@ -12,6 +12,7 @@ namespace Microsoft.DotNet.Tools.Scaffold.AspNet.Templates.BlazorCrud
     using System.Collections.Generic;
     using System.Text;
     using System.Linq;
+    using Microsoft.DotNet.Tools.Scaffold.AspNet.Extensions;
     using System;
     
     /// <summary>
@@ -66,7 +67,8 @@ public virtual string TransformText()
             this.Write("\" OnValidSubmit=\"Update");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write("\" FormName=\"edit\" Enhance>\r\n                <DataAnnotationsValidator />\r\n       " +
-                    "         <ValidationSummary />\r\n                <input type=\"hidden\" name=\"");
+                    "         <ValidationSummary role=\"alert\"/>\r\n                <input type=\"hidden\"" +
+                    " name=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");
             this.Write(this.ToStringHelper.ToStringWithCulture(primaryKeyName));
@@ -83,6 +85,7 @@ public virtual string TransformText()
                     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
+                    var requiredHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
 
             this.Write("                <div class=\"mb-3\">\r\n                    <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
@@ -98,7 +101,9 @@ public virtual string TransformText()
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
-            this.Write("\" />\r\n                    <ValidationMessage For=\"() => ");
+            this.Write("\" ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredHtml));
+            this.Write("/>\r\n                    <ValidationMessage For=\"() => ");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.tt b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.tt
index 4b7bd6160..fe3869f38 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.tt
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.tt
@@ -3,6 +3,7 @@
 <#@  import namespace="System.Collections.Generic" #>
 <#@  import namespace="System.Text" #>
 <#@  import namespace="System.Linq" #>
+<#@  import namespace="Microsoft.DotNet.Tools.Scaffold.AspNet.Extensions" #>
 <#
     string modelName = Model.ModelInfo.ModelTypeName;
     string pluralModel = Model.ModelInfo.ModelTypePluralName;
@@ -46,7 +47,7 @@ else
         <div class="col-md-4">
             <EditForm method="post" Model="<#= modelName #>" OnValidSubmit="Update<#= modelName #>" FormName="edit" Enhance>
                 <DataAnnotationsValidator />
-                <ValidationSummary />
+                <ValidationSummary role="alert"/>
                 <input type="hidden" name="<#= modelName #>.<#= primaryKeyName #>" value="@<#= modelName #>.<#= primaryKeyName #>" />
 <#
                 foreach (var property in entityProperties)
@@ -56,10 +57,11 @@ else
                     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
+                    var requiredHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
 #>
                 <div class="mb-3">
                     <label for="<#= modelPropertyNameLowercase #>" class="form-label"><#= modelPropertyName #>:</label>
-                    <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" />
+                    <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredHtml #>/>
                     <ValidationMessage For="() => <#= modelName #>.<#= modelPropertyName #>" class="text-danger" />
                 </div>
 <#  } #>
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.cs
index 655823424..1fcbfd736 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.cs
@@ -12,6 +12,7 @@ namespace Microsoft.DotNet.Tools.Scaffold.AspNet.Templates.RazorPages
     using System.Collections.Generic;
     using System.Text;
     using System.Linq;
+    using Microsoft.DotNet.Tools.Scaffold.AspNet.Extensions;
     using System;
     
     /// <summary>
@@ -49,8 +50,12 @@ public virtual string TransformText()
     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
     var inputClass = Model.GetInputClassType(propertyShortTypeName);
     var inputTag = Model.GetInputTagType(propertyShortTypeName);
+    string divWhitespace = new string(' ', 16);
+    var propertyRequiredText = property.HasRequiredAttribute() ? $"\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 
-            this.Write("            <div class=\"form-group\">\r\n                <label asp-for=\"");
+            this.Write("            <div class=\"form-group\">");
+            this.Write(this.ToStringHelper.ToStringWithCulture(propertyRequiredText));
+            this.Write("\r\n                <label asp-for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt
index 5aba122a3..624ce7752 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt
@@ -3,6 +3,7 @@
 <#@  import namespace="System.Collections.Generic" #>
 <#@  import namespace="System.Text" #>
 <#@  import namespace="System.Linq" #>
+<#@  import namespace="Microsoft.DotNet.Tools.Scaffold.AspNet.Extensions" #>
 <#
     string modelName = Model.ModelInfo.ModelTypeName;
     string modelNameLowerVariant = modelName.ToLowerInvariant();
@@ -35,8 +36,10 @@ foreach (var property in entityProperties)
     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
     var inputClass = Model.GetInputClassType(propertyShortTypeName);
     var inputTag = Model.GetInputTagType(propertyShortTypeName);
+    string divWhitespace = new string(' ', 16);
+    var propertyRequiredText = property.HasRequiredAttribute() ? $"\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 #>
-            <div class="form-group">
+            <div class="form-group"><#= propertyRequiredText #>
                 <label asp-for="<#= modelName #>.<#= modelPropertyName #>" class="control-label"></label>
                 <<#= inputTag#> asp-for="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" />
                 <span asp-validation-for="<#= modelName #>.<#= modelPropertyName #>" class="text-danger"></span>
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.cs
index 10564f79b..fa58ec916 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.cs
@@ -12,6 +12,7 @@ namespace Microsoft.DotNet.Tools.Scaffold.AspNet.Templates.RazorPages
     using System.Collections.Generic;
     using System.Text;
     using System.Linq;
+    using Microsoft.DotNet.Tools.Scaffold.AspNet.Extensions;
     using System;
     
     /// <summary>
@@ -53,8 +54,12 @@ public virtual string TransformText()
     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
     var inputClass = Model.GetInputClassType(propertyShortTypeName);
     var inputTag = Model.GetInputTagType(propertyShortTypeName);
+    string divWhitespace = new string(' ', 16);
+    var propertyRequiredText = property.HasRequiredAttribute() ? $"\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 
-            this.Write("            <div class=\"form-group\">\r\n                <label asp-for=\"");
+            this.Write("            <div class=\"form-group\">");
+            this.Write(this.ToStringHelper.ToStringWithCulture(propertyRequiredText));
+            this.Write("\r\n                <label asp-for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelNameCapitalized));
             this.Write(".");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.tt b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.tt
index e0262d493..c1d8a21bb 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.tt
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.tt
@@ -3,6 +3,7 @@
 <#@  import namespace="System.Collections.Generic" #>
 <#@  import namespace="System.Text" #>
 <#@  import namespace="System.Linq" #>
+<#@  import namespace="Microsoft.DotNet.Tools.Scaffold.AspNet.Extensions" #>
 <#
     string modelName = Model.ModelInfo.ModelTypeName;
     string modelNamespace = Model.ModelInfo.ModelNamespace;
@@ -36,8 +37,10 @@ foreach (var property in entityProperties)
     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
     var inputClass = Model.GetInputClassType(propertyShortTypeName);
     var inputTag = Model.GetInputTagType(propertyShortTypeName);
+    string divWhitespace = new string(' ', 16);
+    var propertyRequiredText = property.HasRequiredAttribute() ? $"\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 #>
-            <div class="form-group">
+            <div class="form-group"><#= propertyRequiredText #>
                 <label asp-for="<#= modelNameCapitalized #>.<#= modelPropertyName #>" class="control-label"></label>
                 <<#= inputTag#> asp-for="<#= modelNameCapitalized #>.<#= modelPropertyName #>" class="<#= inputClass #>" />
                 <span asp-validation-for="<#= modelNameCapitalized #>.<#= modelPropertyName #>" class="text-danger"></span>

From 50dfad616396ba93c56657abc7f729b939d2eacb Mon Sep 17 00:00:00 2001
From: Deep Choudhery <decho@microsoft.com>
Date: Mon, 28 Oct 2024 15:42:54 -0700
Subject: [PATCH 2/2] PR fixes 1

---
 src/Scaffolding/VS.Web.CG.EFCore/IPropertyExtensions.cs     | 6 +-----
 src/Scaffolding/VS.Web.CG.EFCore/IPropertyMetadata.cs       | 2 +-
 src/Scaffolding/VS.Web.CG.EFCore/PropertyMetadata.cs        | 1 +
 src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs    | 4 ++--
 src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.tt    | 4 ++--
 .../Extensions/PropertySymbolExtensions.cs                  | 4 ++--
 .../dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs   | 4 ++--
 .../dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt   | 4 ++--
 .../dotnet-scaffold-aspnet/Templates/RazorPages/Create.cs   | 4 ++--
 .../dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt   | 4 ++--
 10 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/Scaffolding/VS.Web.CG.EFCore/IPropertyExtensions.cs b/src/Scaffolding/VS.Web.CG.EFCore/IPropertyExtensions.cs
index 4381d2d74..fe48fa6a1 100644
--- a/src/Scaffolding/VS.Web.CG.EFCore/IPropertyExtensions.cs
+++ b/src/Scaffolding/VS.Web.CG.EFCore/IPropertyExtensions.cs
@@ -19,20 +19,16 @@ internal static IPropertyMetadata ToPropertyMetadata(this IProperty property, Ty
             var propertyMetadata = new PropertyMetadata();
             propertyMetadata.PropertyName = property.Name;
             propertyMetadata.TypeName = property.ClrType.FullName;
-
             propertyMetadata.IsPrimaryKey = property.IsPrimaryKey();
             // The old scaffolding has some logic for this property in an edge case which is
             // not clear if needed any more; see EntityFrameworkColumnProvider.DetermineIsForeignKeyComponent
             propertyMetadata.IsForeignKey = property.IsForeignKey();
-
             propertyMetadata.IsEnum = property.ClrType.GetTypeInfo().IsEnum;
             propertyMetadata.IsReadOnly = property.GetBeforeSaveBehavior() != PropertySaveBehavior.Save;
-
             propertyMetadata.IsAutoGenerated = property.ValueGenerated != ValueGenerated.Never || property.GetValueGeneratorFactory() != null;
-            
             propertyMetadata.ShortTypeName = TypeUtil.GetShortTypeName(property.ClrType);
-
             propertyMetadata.Scaffold = true;
+
             var declaringEntityType = property.DeclaringType as IEntityType;
             var reflectionProperty = declaringEntityType?.ClrType.GetProperty(property.Name);
             if (reflectionProperty != null)
diff --git a/src/Scaffolding/VS.Web.CG.EFCore/IPropertyMetadata.cs b/src/Scaffolding/VS.Web.CG.EFCore/IPropertyMetadata.cs
index b1e742513..f47ca8bd4 100644
--- a/src/Scaffolding/VS.Web.CG.EFCore/IPropertyMetadata.cs
+++ b/src/Scaffolding/VS.Web.CG.EFCore/IPropertyMetadata.cs
@@ -18,7 +18,7 @@ public interface IPropertyMetadata
         string ShortTypeName { get; set; }
         string TypeName { get; set; }
         bool IsMultilineText { get; set; }
-        public bool IsRequired { get; set; }
+        bool IsRequired { get; set; }
 
         PropertyInfo PropertyInfo { get; set; }
     }
diff --git a/src/Scaffolding/VS.Web.CG.EFCore/PropertyMetadata.cs b/src/Scaffolding/VS.Web.CG.EFCore/PropertyMetadata.cs
index 872931037..6f5bb399e 100644
--- a/src/Scaffolding/VS.Web.CG.EFCore/PropertyMetadata.cs
+++ b/src/Scaffolding/VS.Web.CG.EFCore/PropertyMetadata.cs
@@ -73,6 +73,7 @@ public PropertyMetadata(PropertyInfo property)
         public bool IsMultilineText { get; set; }
 
         public PropertyInfo PropertyInfo { get; set; }
+
         public bool IsRequired { get; set; }
     }
 }
diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs
index 97483d14e..a485b29ac 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs
@@ -68,7 +68,7 @@ public virtual string TransformText()
                     string propertyShortTypeName = property.ShortTypeName.Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var requiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
             
             this.Write("<div class=\"mb-3\">\r\n                <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
@@ -85,7 +85,7 @@ public virtual string TransformText()
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
             this.Write("\" ");
-            this.Write(this.ToStringHelper.ToStringWithCulture(requiredHtml));
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredAttributeHtml));
             this.Write("/> \r\n                <ValidationMessage For=\"() => ");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");
diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.tt b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.tt
index d4fb8f4ae..a6a7b622c 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.tt
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.tt
@@ -44,11 +44,11 @@
                     string propertyShortTypeName = property.ShortTypeName.Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var requiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
             #>
 <div class="mb-3">
                 <label for="<#= modelPropertyNameLowercase #>" class="form-label"><#= modelPropertyName #>:</label> 
-                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredHtml #>/> 
+                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredAttributeHtml #>/> 
                 <ValidationMessage For="() => <#= modelName #>.<#= modelPropertyName #>" class="text-danger" /> 
             </div>        
             <#  } #>
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Extensions/PropertySymbolExtensions.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Extensions/PropertySymbolExtensions.cs
index 8ebbfb31b..c38659af2 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Extensions/PropertySymbolExtensions.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Extensions/PropertySymbolExtensions.cs
@@ -10,8 +10,8 @@ internal static class PropertySymbolExtensions
 {
     public static bool HasRequiredAttribute(this IPropertySymbol propertySymbol)
     {
-        return propertySymbol.GetAttributes().FirstOrDefault(
+        return propertySymbol.GetAttributes().Any(
             x => x.AttributeClass is not null &&
-            x.AttributeClass.Name.Equals(nameof(RequiredAttribute), StringComparison.OrdinalIgnoreCase)) is not null;
+            x.AttributeClass.Name.Equals(nameof(RequiredAttribute), StringComparison.OrdinalIgnoreCase));
     }
 }
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs
index c04d2f65b..400acef11 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs
@@ -70,7 +70,7 @@ public virtual string TransformText()
                     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+                    var requiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
             
             this.Write("<div class=\"mb-3\">\r\n                <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
@@ -87,7 +87,7 @@ public virtual string TransformText()
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
             this.Write("\" ");
-            this.Write(this.ToStringHelper.ToStringWithCulture(requiredHtml));
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredAttributeHtml));
             this.Write("/> \r\n                <ValidationMessage For=\"() => ");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt
index a6b0a73fe..886c5a141 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt
@@ -46,11 +46,11 @@
                     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+                    var requiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
             #>
 <div class="mb-3">
                 <label for="<#= modelPropertyNameLowercase #>" class="form-label"><#= modelPropertyName #>:</label> 
-                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredHtml #>/> 
+                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredAttributeHtml #>/> 
                 <ValidationMessage For="() => <#= modelName #>.<#= modelPropertyName #>" class="text-danger" /> 
             </div>        
             <#  } #>
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.cs
index 1fcbfd736..1ed2ca1f8 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.cs
@@ -51,10 +51,10 @@ public virtual string TransformText()
     var inputClass = Model.GetInputClassType(propertyShortTypeName);
     var inputTag = Model.GetInputTagType(propertyShortTypeName);
     string divWhitespace = new string(' ', 16);
-    var propertyRequiredText = property.HasRequiredAttribute() ? $"\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
+    var requiredAttributeHtml = property.HasRequiredAttribute() ? $"\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 
             this.Write("            <div class=\"form-group\">");
-            this.Write(this.ToStringHelper.ToStringWithCulture(propertyRequiredText));
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredAttributeHtml));
             this.Write("\r\n                <label asp-for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt
index 624ce7752..417ff8fb3 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt
@@ -37,9 +37,9 @@ foreach (var property in entityProperties)
     var inputClass = Model.GetInputClassType(propertyShortTypeName);
     var inputTag = Model.GetInputTagType(propertyShortTypeName);
     string divWhitespace = new string(' ', 16);
-    var propertyRequiredText = property.HasRequiredAttribute() ? $"\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
+    var requiredAttributeHtml = property.HasRequiredAttribute() ? $"\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 #>
-            <div class="form-group"><#= propertyRequiredText #>
+            <div class="form-group"><#= requiredAttributeHtml #>
                 <label asp-for="<#= modelName #>.<#= modelPropertyName #>" class="control-label"></label>
                 <<#= inputTag#> asp-for="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" />
                 <span asp-validation-for="<#= modelName #>.<#= modelPropertyName #>" class="text-danger"></span>