From b6f1808eedc21752a8a8c9efcad1074a859f913d Mon Sep 17 00:00:00 2001
From: Deep Choudhery <54324771+deepchoudhery@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:37:52 -0800
Subject: [PATCH] updates for razor pages crud and blazor crud templates
 (#3086)

* updates for razor pages crud and blazor crud templates

* PR fixes
---
 eng/Versions.DotNetScaffold.props             |  2 +-
 eng/Versions.props                            |  6 ++--
 scripts/install-aspnet-codegenerator.cmd      |  2 +-
 scripts/install-scaffold-all.cmd              |  2 +-
 .../VS.Web.CG.Mvc/Templates/Blazor/Create.cs  | 10 +++++--
 .../VS.Web.CG.Mvc/Templates/Blazor/Create.tt  |  8 ++++--
 .../VS.Web.CG.Mvc/Templates/Blazor/Edit.cs    | 10 +++++--
 .../VS.Web.CG.Mvc/Templates/Blazor/Edit.tt    |  8 ++++--
 .../Bootstrap5/Create.cshtml                  | 13 +++++----
 .../RazorPageGenerator/Bootstrap5/Edit.cshtml | 28 ++++++++-----------
 .../Templates/BlazorCrud/Create.cs            | 10 +++++--
 .../Templates/BlazorCrud/Create.tt            |  8 ++++--
 .../Templates/BlazorCrud/Edit.cs              | 10 +++++--
 .../Templates/BlazorCrud/Edit.tt              |  8 ++++--
 .../Templates/RazorPages/Create.cs            |  7 +++--
 .../Templates/RazorPages/Create.tt            |  5 ++--
 .../Templates/RazorPages/Edit.cs              |  9 ++++--
 .../Templates/RazorPages/Edit.tt              |  7 +++--
 18 files changed, 91 insertions(+), 62 deletions(-)

diff --git a/eng/Versions.DotNetScaffold.props b/eng/Versions.DotNetScaffold.props
index 327178f21..c49807c67 100644
--- a/eng/Versions.DotNetScaffold.props
+++ b/eng/Versions.DotNetScaffold.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionPrefix>9.0.0</VersionPrefix>
+<VersionPrefix>9.0.0</VersionPrefix>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>10</PreReleaseVersionIteration>
     <IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
diff --git a/eng/Versions.props b/eng/Versions.props
index 681741090..25c0fcacb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -62,9 +62,9 @@
     <MicrosoftDotNetPlatformAbstractionsVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>9.0.0</VersionPrefix>
-    <PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>2</PreReleaseVersionIteration>
+    <VersionPrefix>10.0.0</VersionPrefix>
+    <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
+    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
     <IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
     <IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>
     <!--
diff --git a/scripts/install-aspnet-codegenerator.cmd b/scripts/install-aspnet-codegenerator.cmd
index 2c82125a0..62b4f4e26 100644
--- a/scripts/install-aspnet-codegenerator.cmd
+++ b/scripts/install-aspnet-codegenerator.cmd
@@ -1,4 +1,4 @@
-set VERSION=9.0.0-dev
+set VERSION=10.0.0-dev
 set DEFAULT_NUPKG_PATH=C:\Nuget
 set SRC_DIR=%cd%
 set NUPKG=artifacts\packages\Debug\Shipping\
diff --git a/scripts/install-scaffold-all.cmd b/scripts/install-scaffold-all.cmd
index e2fb22ee6..b1533c7ec 100644
--- a/scripts/install-scaffold-all.cmd
+++ b/scripts/install-scaffold-all.cmd
@@ -1,4 +1,4 @@
-set VERSION=9.0.0-dev
+set VERSION=10.0.0-dev
 set DEFAULT_NUPKG_PATH=%userprofile%/.nuget/packages
 set SRC_DIR=%cd%
 set NUPKG=artifacts/packages/Debug/Shipping/
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 a485b29ac..25d2be790 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs
@@ -68,9 +68,13 @@ public virtual string TransformText()
                     string propertyShortTypeName = property.ShortTypeName.Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var ariaRequiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.IsRequired ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
             
-            this.Write("<div class=\"mb-3\">\r\n                <label for=\"");
+            this.Write("<div class=\"mb-3\">");
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredSpanAttributeHtml));
+            this.Write("\r\n                <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
             this.Write("\" class=\"form-label\">");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
@@ -85,7 +89,7 @@ public virtual string TransformText()
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
             this.Write("\" ");
-            this.Write(this.ToStringHelper.ToStringWithCulture(requiredAttributeHtml));
+            this.Write(this.ToStringHelper.ToStringWithCulture(ariaRequiredAttributeHtml));
             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 a6a7b622c..196994694 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,13 @@
                     string propertyShortTypeName = property.ShortTypeName.Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var ariaRequiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.IsRequired ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
             #>
-<div class="mb-3">
+<div class="mb-3"><#= requiredSpanAttributeHtml #>
                 <label for="<#= modelPropertyNameLowercase #>" class="form-label"><#= modelPropertyName #>:</label> 
-                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredAttributeHtml #>/> 
+                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= ariaRequiredAttributeHtml #>/> 
                 <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 f7d47b8b6..e6f547e63 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.cs
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.cs
@@ -83,9 +83,13 @@ 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 ariaRequiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.IsRequired ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 
-            this.Write("                <div class=\"mb-3\">\r\n                    <label for=\"");
+            this.Write("                <div class=\"mb-3\">");
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredSpanAttributeHtml));
+            this.Write("\r\n                    <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
             this.Write("\" class=\"form-label\">");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
@@ -100,7 +104,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(ariaRequiredAttributeHtml));
             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/Edit.tt b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.tt
index 493426d5b..5617b877c 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.tt
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.tt
@@ -55,11 +55,13 @@ 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;
+                    var ariaRequiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.IsRequired ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 #>
-                <div class="mb-3">
+                <div class="mb-3"><#= requiredSpanAttributeHtml #>
                     <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 #>" <#= ariaRequiredAttributeHtml #>/>
                     <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 57e127100..0e9df48e0 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
@@ -48,14 +48,15 @@
     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;
+        var propertyRequiredText = property.IsRequired ? $"\r\n{sixteenWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
+        var ariaRequiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
         if (property.Scaffold && !property.IsAutoGenerated && !property.IsReadOnly)
             {
                 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>
+                @:<select asp-for="@(Model.ModelTypeName).@property.PropertyName" class ="form-control" asp-items="ViewBag.@property.PropertyName" @ariaRequiredAttributeHtml></select>
             @:</div>
                     continue;
                 }
@@ -65,7 +66,7 @@
                 {
             @:<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))
+                    @:<input class="form-check-input" asp-for="@(Model.ModelTypeName).@property.PropertyName" @ariaRequiredAttributeHtml/> @@Html.DisplayNameFor(model => model.@(Model.ModelTypeName).@GetValueExpression(property))
                 @:</label>
             @:</div>
                 }
@@ -73,7 +74,7 @@
                 {
             @:<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>
+                @:<select asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control" @ariaRequiredAttributeHtml></select>
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
             @:</div>
                 }
@@ -81,7 +82,7 @@
                 {
             @:<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>
+                @:<textarea asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control" @ariaRequiredAttributeHtml></textarea>
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
             @:</div>
                 }
@@ -89,7 +90,7 @@
                 {
             @:<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" />
+                @:<input asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control" @ariaRequiredAttributeHtml/>
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
             @:</div>
                 }
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 e2d5109ce..2eb7e3b83 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
@@ -47,7 +47,8 @@
             @:<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;
+            var propertyRequiredText = property.IsRequired ? "\r\n<span class=\"text-danger\">*</span>" : string.Empty;
+            var ariaRequiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
             if (property.IsPrimaryKey)
             {
             @:<input type="hidden" asp-for="@(Model.ModelTypeName).@property.PropertyName" />
@@ -63,10 +64,9 @@
 
                 if (property.IsForeignKey)
                 {
-            @:<div class="form-group">
-                @:@propertyRequiredText
+            @:<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>
+                @:<select asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control" asp-items="ViewBag.@property.PropertyName" @ariaRequiredAttributeHtml></select>
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
             @:</div>
                     continue;
@@ -75,37 +75,33 @@
                 bool isCheckbox = property.TypeName.Equals("System.Boolean");
                 if (isCheckbox)
                 {
-            @:<div class="form-group form-check">
-                @:@propertyRequiredText
+            @:<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))
+                    @:<input class="form-check-input" asp-for="@(Model.ModelTypeName).@property.PropertyName" @ariaRequiredAttributeHtml/> @@Html.DisplayNameFor(model => model.@(Model.ModelTypeName).@GetValueExpression(property))
                 @:</label>
             @:</div>
                 }
                 else if (property.IsEnum && !property.IsEnumFlags)
                 {
-            @:<div class="form-group">
-                @:@propertyRequiredText
+            @:<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>
+                @:<select asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control" @ariaRequiredAttributeHtml></select>
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
             @:</div>
                 }
                 else if (property.IsMultilineText)
                 {
-            @:<div class="form-group">
-                @:@propertyRequiredText
+            @:<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>
+                @:<textarea asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control" @ariaRequiredAttributeHtml></textarea>
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
             @:</div>
                 }
                 else
                 {
-            @:<div class="form-group">
-                @:@propertyRequiredText
+            @:<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" />
+                @:<input asp-for="@(Model.ModelTypeName).@property.PropertyName" class="form-control" @ariaRequiredAttributeHtml/>
                 @:<span asp-validation-for="@(Model.ModelTypeName).@property.PropertyName" class="text-danger"></span>
             @:</div>
                 }
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 400acef11..8ed9e7f3b 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs
@@ -70,9 +70,13 @@ public virtual string TransformText()
                     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+                    var ariaRequiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.HasRequiredAttribute() ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
             
-            this.Write("<div class=\"mb-3\">\r\n                <label for=\"");
+            this.Write("<div class=\"mb-3\">");
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredSpanAttributeHtml));
+            this.Write("\r\n                <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
             this.Write("\" class=\"form-label\">");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
@@ -87,7 +91,7 @@ public virtual string TransformText()
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
             this.Write("\" ");
-            this.Write(this.ToStringHelper.ToStringWithCulture(requiredAttributeHtml));
+            this.Write(this.ToStringHelper.ToStringWithCulture(ariaRequiredAttributeHtml));
             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 886c5a141..ce0755347 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,13 @@
                     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+                    var ariaRequiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.HasRequiredAttribute() ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
             #>
-<div class="mb-3">
+<div class="mb-3"><#= requiredSpanAttributeHtml #>
                 <label for="<#= modelPropertyNameLowercase #>" class="form-label"><#= modelPropertyName #>:</label> 
-                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredAttributeHtml #>/> 
+                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= ariaRequiredAttributeHtml #>/> 
                 <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 c84ae7700..dcd6a8c5c 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.cs
@@ -85,9 +85,13 @@ 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 ariaRequiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.HasRequiredAttribute() ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 
-            this.Write("                <div class=\"mb-3\">\r\n                    <label for=\"");
+            this.Write("                <div class=\"mb-3\">");
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredSpanAttributeHtml));
+            this.Write("\r\n                    <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
             this.Write("\" class=\"form-label\">");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
@@ -102,7 +106,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(ariaRequiredAttributeHtml));
             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/Edit.tt b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.tt
index fe3869f38..406d7cb44 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.tt
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.tt
@@ -57,11 +57,13 @@ 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;
+                    var ariaRequiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.HasRequiredAttribute() ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 #>
-                <div class="mb-3">
+                <div class="mb-3"><#= requiredSpanAttributeHtml #>
                     <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 #>" <#= ariaRequiredAttributeHtml #>/>
                     <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 1ed2ca1f8..7108a1965 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.cs
@@ -51,7 +51,8 @@ public virtual string TransformText()
     var inputClass = Model.GetInputClassType(propertyShortTypeName);
     var inputTag = Model.GetInputTagType(propertyShortTypeName);
     string divWhitespace = new string(' ', 16);
-    var requiredAttributeHtml = property.HasRequiredAttribute() ? $"\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
+    var ariaRequiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+    var requiredAttributeHtml = property.HasRequiredAttribute() ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 
             this.Write("            <div class=\"form-group\">");
             this.Write(this.ToStringHelper.ToStringWithCulture(requiredAttributeHtml));
@@ -67,7 +68,9 @@ public virtual string TransformText()
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
-            this.Write("\" />\r\n                <span asp-validation-for=\"");
+            this.Write("\" ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(ariaRequiredAttributeHtml));
+            this.Write("/>\r\n                <span asp-validation-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 417ff8fb3..6a7c6150c 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt
@@ -37,11 +37,12 @@ foreach (var property in entityProperties)
     var inputClass = Model.GetInputClassType(propertyShortTypeName);
     var inputTag = Model.GetInputTagType(propertyShortTypeName);
     string divWhitespace = new string(' ', 16);
-    var requiredAttributeHtml = property.HasRequiredAttribute() ? $"\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
+    var ariaRequiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+    var requiredAttributeHtml = property.HasRequiredAttribute() ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 #>
             <div class="form-group"><#= requiredAttributeHtml #>
                 <label asp-for="<#= modelName #>.<#= modelPropertyName #>" class="control-label"></label>
-                <<#= inputTag#> asp-for="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" />
+                <<#= inputTag#> asp-for="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= ariaRequiredAttributeHtml #>/>
                 <span asp-validation-for="<#= modelName #>.<#= modelPropertyName #>" class="text-danger"></span>
             </div>
 <#
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 fa58ec916..c97339060 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.cs
@@ -55,10 +55,11 @@ 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 ariaRequiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+    var requiredAttributeHtml = property.HasRequiredAttribute() ? $"\r\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(modelNameCapitalized));
             this.Write(".");
@@ -71,7 +72,9 @@ public virtual string TransformText()
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
-            this.Write("\" />\r\n                <span asp-validation-for=\"");
+            this.Write("\" ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(ariaRequiredAttributeHtml));
+            this.Write("/>\r\n                <span asp-validation-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 c1d8a21bb..1df25d584 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.tt
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.tt
@@ -38,11 +38,12 @@ 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 ariaRequiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+    var requiredAttributeHtml = property.HasRequiredAttribute() ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 #>
-            <div class="form-group"><#= propertyRequiredText #>
+            <div class="form-group"><#= requiredAttributeHtml #>
                 <label asp-for="<#= modelNameCapitalized #>.<#= modelPropertyName #>" class="control-label"></label>
-                <<#= inputTag#> asp-for="<#= modelNameCapitalized #>.<#= modelPropertyName #>" class="<#= inputClass #>" />
+                <<#= inputTag#> asp-for="<#= modelNameCapitalized #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= ariaRequiredAttributeHtml #>/>
                 <span asp-validation-for="<#= modelNameCapitalized #>.<#= modelPropertyName #>" class="text-danger"></span>
             </div>
 <#