From d8e4b9c9ee4fa14c5cdfdfbb97dd1f74aefe4208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 18 Sep 2017 15:40:23 +0300 Subject: [PATCH] Added AbpViewComponent and fixed Dockerfile for .netcoreapp 2.0. --- src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs | 13 ++++++++++++- src/AbpDesk/AbpDesk.Web.Mvc/Dockerfile | 2 +- .../Components/AbpMenu/AbpMenuViewComponent.cs | 2 +- .../AbpScriptBundle/AbpStyleBundleViewComponent.cs | 2 +- .../AbpStyleBundle/AbpStyleBundleViewComponent.cs | 2 +- .../Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs | 2 +- .../Volo/Abp/AspNetCore/Mvc/AbpViewComponent.cs | 9 +++++++++ 7 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpViewComponent.cs diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs index 91562c41a0..0a4062e137 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs @@ -1,4 +1,5 @@ -using AbpDesk.EntityFrameworkCore; +using System; +using AbpDesk.EntityFrameworkCore; using AbpDesk.Web.Mvc.Navigation; using AbpDesk.Web.Mvc.Temp; using Autofac; @@ -9,11 +10,13 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp; using Volo.Abp.AspNetCore.EmbeddedFiles; using Volo.Abp.AspNetCore.Modularity; +using Volo.Abp.AspNetCore.Mvc.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; using Volo.Abp.Autofac; using Volo.Abp.Identity; using Volo.Abp.Identity.Web; using Volo.Abp.Modularity; +using Volo.Abp.Timing; using Volo.Abp.Ui.Navigation; namespace AbpDesk.Web.Mvc @@ -48,6 +51,14 @@ namespace AbpDesk.Web.Mvc services.AddAssemblyOf(); services.GetContainerBuilder().RegisterType(); + + services.Configure(options => + { + options.ScriptBundles.Add("GlobalScripts", new[] + { + "/AbpServiceProxies/GetAll?_v=" + DateTime.Now.Ticks + }); + }); } public override void OnApplicationInitialization(ApplicationInitializationContext context) diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Dockerfile b/src/AbpDesk/AbpDesk.Web.Mvc/Dockerfile index 35dbafd45e..de23365b25 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Dockerfile +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore +FROM microsoft/aspnetcore:2.0 WORKDIR /app COPY . . diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs index 769db22ead..146db99f38 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs @@ -4,7 +4,7 @@ using Volo.Abp.Ui.Navigation; namespace Volo.Abp.AspNetCore.Mvc.Views.Shared.Components.AbpMenu { - public class AbpMenuViewComponent : ViewComponent + public class AbpMenuViewComponent : AbpViewComponent { private readonly IMenuManager _menuManager; diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpScriptBundle/AbpStyleBundleViewComponent.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpScriptBundle/AbpStyleBundleViewComponent.cs index e9aae510c5..0276c22360 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpScriptBundle/AbpStyleBundleViewComponent.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpScriptBundle/AbpStyleBundleViewComponent.cs @@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc.Bundling; namespace Volo.Abp.AspNetCore.Mvc.Views.Shared.Components.AbpScriptBundle { - public class AbpScriptBundleViewComponent : ViewComponent + public class AbpScriptBundleViewComponent : AbpViewComponent { private readonly IBundleManager _bundleManager; diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpStyleBundle/AbpStyleBundleViewComponent.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpStyleBundle/AbpStyleBundleViewComponent.cs index c8e868f718..5152e3b710 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpStyleBundle/AbpStyleBundleViewComponent.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpStyleBundle/AbpStyleBundleViewComponent.cs @@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc.Bundling; namespace Volo.Abp.AspNetCore.Mvc.Views.Shared.Components.AbpStyleBundle { - public class AbpStyleBundleViewComponent : ViewComponent + public class AbpStyleBundleViewComponent : AbpViewComponent { private readonly IBundleManager _bundleManager; diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs index c562244d68..072e523877 100644 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs +++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs @@ -45,7 +45,7 @@ namespace Volo.Abp.AspNetCore.Mvc public override void PostConfigureServices(IServiceCollection services) { - //TODO: Consider to use services.AddMvc() and move this to ConfigureServices method! + //TODO: Consider to use services.AddMvc() and move this to ConfigureServices method! And also use .AddControllersAsServices and .AddViewComponentsAsServices... services.TryAddSingleton(); services.TryAddSingleton(); diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpViewComponent.cs b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpViewComponent.cs new file mode 100644 index 0000000000..5696b06501 --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpViewComponent.cs @@ -0,0 +1,9 @@ +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.AspNetCore.Mvc +{ + public abstract class AbpViewComponent : ViewComponent, ITransientDependency + { + } +}