fixed mvc and mvc-module template namespaces

templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs

@@ -10,6 +10,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
+using MyCompanyName.MyProjectName.Web;
 using StackExchange.Redis;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Authentication.OAuth;

templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs

@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.EntityFrameworkCore;
 using MyCompanyName.MyProjectName.MultiTenancy;
+using MyCompanyName.MyProjectName.Web;
 using Swashbuckle.AspNetCore.Swagger;
 using Volo.Abp;
 using Volo.Abp.Account.Web;

templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj

@@ -7,7 +7,7 @@
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <IsPackable>true</IsPackable>
     <OutputType>Library</OutputType>
-    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
+    <RootNamespace>MyCompanyName.MyProjectName.Web</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.UI.Navigation;
 
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
 {
     public class MyProjectNameMenuContributor : IMenuContributor
     {

templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
 
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
 {
     public class MyProjectNameWebAutoMapperProfile : Profile
     {

templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs

@@ -10,7 +10,7 @@ using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
 
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
 {
     [DependsOn(
         typeof(MyProjectNameHttpApiModule),

templates/mvc/src/MyCompanyName.MyProjectName.Web/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
     {

templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
+    <RootNamespace>MyCompanyName.MyProjectName.Web</RootNamespace>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>

templates/mvc/src/MyCompanyName.MyProjectName.Web/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

templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
 
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
 {
     public class MyProjectNameWebAutoMapperProfile : Profile
     {

templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs

@@ -1,14 +1,14 @@
-using Localization.Resources.AbpUi;
+using System.IO;
+using Localization.Resources.AbpUi;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.EntityFrameworkCore;
-using MyCompanyName.MyProjectName.Menus;
-using Swashbuckle.AspNetCore.Swagger;
-using System.IO;
-using Microsoft.Extensions.Configuration;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
+using MyCompanyName.MyProjectName.Web.Menus;
+using Swashbuckle.AspNetCore.Swagger;
 using Volo.Abp;
 using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Authentication.JwtBearer;
@@ -30,7 +30,7 @@ using Volo.Abp.UI;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
 
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
 {
     [DependsOn(
         typeof(MyProjectNameHttpApiModule),

templates/mvc/src/MyCompanyName.MyProjectName.Web/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 {
     <abp-style-bundle>
         <abp-style src="/Pages/Index.css" />

templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml.cs

@@ -1,4 +1,4 @@
-namespace MyCompanyName.MyProjectName.Pages
+namespace MyCompanyName.MyProjectName.Web.Pages
 {
     public class IndexModel : MyProjectNamePageModelBase
     {

templates/mvc/src/MyCompanyName.MyProjectName.Web/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
     {

templates/mvc/src/MyCompanyName.MyProjectName.Web/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
     {

templates/mvc/src/MyCompanyName.MyProjectName.Web/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
     {

templates/mvc/src/MyCompanyName.MyProjectName.Web/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
     {

templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs

@@ -7,7 +7,8 @@ using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using MyCompanyName.MyProjectName.Localization;
-using MyCompanyName.MyProjectName.Menus;
+using MyCompanyName.MyProjectName.Web;
+using MyCompanyName.MyProjectName.Web.Menus;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.TestBase;
 using Volo.Abp.Localization;