Merge branch 'rel-4.0' of https://github.com/abpframework/abp into rel-4.0

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbItemTagHelperService.cs

@@ -46,7 +46,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Breadcrumb
 
             var link = new TagBuilder("a");
             link.Attributes.Add("href", TagHelper.Href);
-            link.InnerHtml.Append(TagHelper.Title);
+            link.InnerHtml.AppendHtml(TagHelper.Title);
             return link.ToHtmlString();
         }
     }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Button/AbpButtonTagHelperServiceBase.cs

@@ -69,7 +69,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Button
             }
 
             var span = new TagBuilder("span");
-            span.InnerHtml.Append(TagHelper.Text);
+            span.InnerHtml.AppendHtml(TagHelper.Text);
             output.Content.AppendHtml(span);
         }
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelperService.cs

@@ -22,7 +22,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Card
             {
                 var cardTitle = new TagBuilder(AbpCardTitleTagHelper.DefaultHeading.ToHtmlTag());
                 cardTitle.AddCssClass("card-title");
-                cardTitle.InnerHtml.Append(TagHelper.Title);
+                cardTitle.InnerHtml.AppendHtml(TagHelper.Title);
                 output.PreContent.AppendHtml(cardTitle);
             }
         }
@@ -33,9 +33,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Card
             {
                 var cardSubtitle = new TagBuilder(AbpCardSubtitleTagHelper.DefaultHeading.ToHtmlTag());
                 cardSubtitle.AddCssClass("card-subtitle text-muted mb-2");
-                cardSubtitle.InnerHtml.Append(TagHelper.Subtitle);
+                cardSubtitle.InnerHtml.AppendHtml(TagHelper.Subtitle);
                 output.PreContent.AppendHtml(cardSubtitle);
             }
         }
     }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselItemTagHelperService.cs

@@ -66,10 +66,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Carousel
             }
 
             var title = new TagBuilder("h5");
-            title.InnerHtml.Append(TagHelper.CaptionTitle);
+            title.InnerHtml.AppendHtml(TagHelper.CaptionTitle);
 
             var caption = new TagBuilder("p");
-            caption.InnerHtml.Append(TagHelper.Caption);
+            caption.InnerHtml.AppendHtml(TagHelper.Caption);
 
             var wrapper = new TagBuilder("div");
             wrapper.AddCssClass("carousel-caption d-none d-md-block");

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs

@@ -32,7 +32,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Collapse
             button.Attributes.Add("data-target", "#" + GetContentId());
             button.Attributes.Add("aria-expanded", "true");
             button.Attributes.Add("aria-controls", GetContentId());
-            button.InnerHtml.Append(TagHelper.Title);
+            button.InnerHtml.AppendHtml(TagHelper.Title);
 
             var h5 = new TagBuilder("h5");
             h5.AddCssClass("mb-0");

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs

@@ -74,7 +74,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 var label = new TagBuilder("label");
                 label.AddCssClass("custom-control-label");
                 label.Attributes.Add("for", id);
-                label.InnerHtml.Append(selectItem.Text);
+                label.InnerHtml.AppendHtml(selectItem.Text);
 
                 var wrapper = new TagBuilder("div");
                 wrapper.AddCssClass("custom-control custom-radio" + inlineClass);

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs

@@ -168,7 +168,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             {
                 var label = new TagBuilder("label");
                 label.Attributes.Add("for", GetIdAttributeValue(selectTag));
-                label.InnerHtml.Append(TagHelper.Label);
+                label.InnerHtml.AppendHtml(TagHelper.Label);
 
                 return label.ToHtmlString() + GetRequiredSymbol(context, output);
             }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalHeaderTagHelperService.cs

@@ -27,7 +27,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
         {
             var title = new TagBuilder("h5");
             title.AddCssClass("modal-title");
-            title.InnerHtml.Append(TagHelper.Title);
+            title.InnerHtml.AppendHtml(TagHelper.Title);
 
             return title.ToHtmlString();
         }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs

@@ -40,7 +40,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
             anchor.Attributes.Add("role", "button");
             anchor.Attributes.Add("aria-haspopup", "true");
             anchor.Attributes.Add("aria-expanded", "false");
-            anchor.InnerHtml.Append(title);
+            anchor.InnerHtml.AppendHtml(title);
 
             var menu = new TagBuilder("div");
             menu.AddCssClass("dropdown-menu");

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabLinkTagHelperService.cs

@@ -35,7 +35,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
                 anchor.AddCssClass("dropdown-item");
                 anchor.Attributes.Add("id", id);
                 anchor.Attributes.Add("href", href);
-                anchor.InnerHtml.Append(title);
+                anchor.InnerHtml.AppendHtml(title);
 
                 return anchor.ToHtmlString();
             }
@@ -45,7 +45,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
                 anchor.AddCssClass("nav-link " + AbpTabItemActivePlaceholder);
                 anchor.Attributes.Add("id", id);
                 anchor.Attributes.Add("href", href);
-                anchor.InnerHtml.Append(title);
+                anchor.InnerHtml.AppendHtml(title);
 
                 var listItem = new TagBuilder("li");
                 listItem.AddCssClass("nav-item");

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs

@@ -53,7 +53,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
                     anchor.Attributes.Add(attr.Name, attr.Value.ToString());
                 }
 
-                anchor.InnerHtml.Append(title);
+                anchor.InnerHtml.AppendHtml(title);
 
                 return anchor.ToHtmlString();
             }
@@ -73,7 +73,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
                     anchor.Attributes.Add(attr.Name, attr.Value.ToString());
                 }
 
-                anchor.InnerHtml.Append(title);
+                anchor.InnerHtml.AppendHtml(title);
 
                 var listItem = new TagBuilder("li");
                 listItem.AddCssClass("nav-item");

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs

@@ -35,6 +35,10 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Module
                 "MyCompanyName.MyProjectName.Web"
             ));
 
+            steps.Add(new RemoveProjectFromSolutionStep(
+                "MyCompanyName.MyProjectName.Blazor"
+            ));
+
             steps.Add(new RemoveProjectFromSolutionStep(
                 "MyCompanyName.MyProjectName.Web.Host",
                 projectFolderPath: "/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host"
@@ -63,7 +67,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Module
         {
             steps.Add(new UpdateNuGetConfigStep("/aspnet-core/NuGet.Config"));
         }
-        
+
         private void CleanupFolderHierarchy(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
         {
             steps.Add(new MoveFolderStep("/aspnet-core/", "/"));