From ba3d3cf71119b42c1de28e7a81ca1ad2e6879f57 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 24 Nov 2020 11:35:20 +0300 Subject: [PATCH 1/2] Fix: ABP CLI creates Blazor project even with --no-ui parameter resolves https://github.com/volosoft/volo/issues/4082 --- .../ProjectBuilding/Templates/Module/ModuleTemplateBase.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs index c9976712c9..78fd522265 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs +++ b/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 steps) { steps.Add(new MoveFolderStep("/aspnet-core/", "/")); From 5ccd9fcedae37539f7d4fea58be570664ecee048 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Tue, 24 Nov 2020 16:45:48 +0800 Subject: [PATCH 2/2] Use AppendHtml instead of Append --- .../Breadcrumb/AbpBreadcrumbItemTagHelperService.cs | 2 +- .../TagHelpers/Button/AbpButtonTagHelperServiceBase.cs | 2 +- .../TagHelpers/Card/AbpCardBodyTagHelperService.cs | 6 +++--- .../TagHelpers/Carousel/AbpCarouselItemTagHelperService.cs | 4 ++-- .../TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs | 2 +- .../TagHelpers/Form/AbpRadioInputTagHelperService.cs | 2 +- .../TagHelpers/Form/AbpSelectTagHelperService.cs | 2 +- .../TagHelpers/Modal/AbpModalHeaderTagHelperService.cs | 2 +- .../TagHelpers/Tab/AbpTabDropdownTagHelperService.cs | 2 +- .../TagHelpers/Tab/AbpTabLinkTagHelperService.cs | 4 ++-- .../TagHelpers/Tab/AbpTabTagHelperService.cs | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbItemTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbItemTagHelperService.cs index 5f649db448..3fa8a27472 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbItemTagHelperService.cs +++ b/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(); } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Button/AbpButtonTagHelperServiceBase.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Button/AbpButtonTagHelperServiceBase.cs index ff0b9dd34f..cb795bdc6c 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Button/AbpButtonTagHelperServiceBase.cs +++ b/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); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelperService.cs index 0aab5ba900..5707775a3a 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelperService.cs +++ b/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); } } } -} \ No newline at end of file +} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselItemTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselItemTagHelperService.cs index d3736a384a..1af2b759a4 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselItemTagHelperService.cs +++ b/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"); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs index 0cd400d43c..f9e019391f 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs +++ b/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"); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs index 8d5c704830..bfbf4034eb 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs +++ b/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); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs index 7741807aae..10208aa5e9 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs +++ b/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); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalHeaderTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalHeaderTagHelperService.cs index 7473245e96..4a45ac1f20 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalHeaderTagHelperService.cs +++ b/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(); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs index cdaf55d87c..02810e9666 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs +++ b/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"); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabLinkTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabLinkTagHelperService.cs index 1955127114..56ceea5c9e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabLinkTagHelperService.cs +++ b/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"); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs index c4d4b654a9..db05c5c686 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs +++ b/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");