diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs index 3c1f22206a..5f158525f3 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs @@ -6,7 +6,7 @@ using MyCompanyName.MyProjectName.MultiTenancy; using Volo.Abp.TenantManagement.Web.Navigation; using Volo.Abp.UI.Navigation; -namespace MyCompanyName.MyProjectName.Menus +namespace MyCompanyName.MyProjectName.Web.Menus { public class MyProjectNameMenuContributor : IMenuContributor { diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 509751db3c..8390830f55 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -4,7 +4,7 @@ netcoreapp2.2 - MyCompanyName.MyProjectName + MyCompanyName.MyProjectName.Web $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true true diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameBrandingProvider.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameBrandingProvider.cs index aba2d3920e..ce09452496 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameBrandingProvider.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameBrandingProvider.cs @@ -1,7 +1,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components; using Volo.Abp.DependencyInjection; -namespace MyCompanyName.MyProjectName +namespace MyCompanyName.MyProjectName.Web { [Dependency(ReplaceServices = true)] public class MyProjectNameBrandingProvider : DefaultBrandingProvider diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebAutoMapperProfile.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebAutoMapperProfile.cs index b8069ae329..e728b8a6e7 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebAutoMapperProfile.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebAutoMapperProfile.cs @@ -1,6 +1,6 @@ using AutoMapper; -namespace MyCompanyName.MyProjectName +namespace MyCompanyName.MyProjectName.Web { public class MyProjectNameWebAutoMapperProfile : Profile { diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 01353ad6ed..7eba8ff7c8 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -1,17 +1,17 @@ using System; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using MyCompanyName.MyProjectName.Menus; -using Swashbuckle.AspNetCore.Swagger; using System.IO; using Microsoft.AspNetCore.Authentication.OAuth.Claims; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; +using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Protocols.OpenIdConnect; using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; +using MyCompanyName.MyProjectName.Web.Menus; using StackExchange.Redis; +using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.OAuth; using Volo.Abp.AspNetCore.Mvc.Client; @@ -34,7 +34,7 @@ using Volo.Abp.UI; using Volo.Abp.UI.Navigation; using Volo.Abp.VirtualFileSystem; -namespace MyCompanyName.MyProjectName +namespace MyCompanyName.MyProjectName.Web { [DependsOn( typeof(MyProjectNameHttpApiModule), diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml index c99ff43169..46a650e6b2 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml @@ -1,7 +1,6 @@ @page -@using MyCompanyName.MyProjectName.Pages -@inherits MyProjectNamePageBase -@model IndexModel +@inherits MyCompanyName.MyProjectName.Web.Pages.MyProjectNamePageBase +@model MyCompanyName.MyProjectName.Web.Pages.IndexModel @section styles { diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml.cs index 735570b82e..967ee7b353 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; -namespace MyCompanyName.MyProjectName.Pages +namespace MyCompanyName.MyProjectName.Web.Pages { public class IndexModel : MyProjectNamePageModelBase { diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageBase.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageBase.cs index fde2c858b9..217c70d491 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageBase.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageBase.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc.Razor.Internal; using MyCompanyName.MyProjectName.Localization; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; -namespace MyCompanyName.MyProjectName.Pages +namespace MyCompanyName.MyProjectName.Web.Pages { public abstract class MyProjectNamePageBase : AbpPage { diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageModelBase.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageModelBase.cs index 88795db56d..afd22b08c4 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageModelBase.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageModelBase.cs @@ -1,7 +1,7 @@ using MyCompanyName.MyProjectName.Localization; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; -namespace MyCompanyName.MyProjectName.Pages +namespace MyCompanyName.MyProjectName.Web.Pages { public abstract class MyProjectNamePageModelBase : AbpPageModel { diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Program.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Program.cs index 22b560f34f..ca7eeab845 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Program.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Program.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Hosting; using Serilog; using Serilog.Events; -namespace MyCompanyName.MyProjectName +namespace MyCompanyName.MyProjectName.Web { public class Program { diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Startup.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Startup.cs index 2e788dc051..db5c45e654 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Startup.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Startup.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Volo.Abp; -namespace MyCompanyName.MyProjectName +namespace MyCompanyName.MyProjectName.Web { public class Startup {