Merge pull request #4016 from abpframework/maliming/RazorRuntimeCompilation

Optimize RazorRuntimeCompilation.

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj

@@ -18,10 +18,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Volo\Abp\AspNetCore\Mvc\UI\MultiTenancy\Localization\*.json" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Volo\Abp\AspNetCore\Mvc\UI\MultiTenancy\Localization\*.json" />
   </ItemGroup>

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj

@@ -17,17 +17,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Themes\**\*.cshtml" />
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
-    <EmbeddedResource Include="Views\**\*.cshtml" />
     <EmbeddedResource Include="wwwroot\**\*.*" />
   </ItemGroup>
 
   <ItemGroup>
     <Content Remove="wwwroot\**\*.*" />
-    <Content Remove="Themes\**\*.cshtml" />
-    <Content Remove="Pages\**\*.cshtml" />
-    <Content Remove="Views\**\*.cshtml" />
     <Content Remove="Properties\launchSettings.json" />
     <None Include="Properties\launchSettings.json" />
   </ItemGroup>
@@ -36,5 +30,5 @@
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj" />
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
   </ItemGroup>
-  
+
 </Project>

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj

@@ -17,11 +17,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Views\**\*.cshtml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Remove="Views\**\*.cshtml" />
     <Content Remove="compilerconfig.json" />
     <Content Remove="Properties\launchSettings.json" />
     <None Include="Properties\launchSettings.json" />

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj

@@ -18,16 +18,10 @@
 
   <ItemGroup>
     <EmbeddedResource Include="wwwroot\**\*.*" />
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
-    <EmbeddedResource Include="Views\**\*.cshtml" />
-    <EmbeddedResource Include="Areas\**\*.cshtml" />
   </ItemGroup>
 
   <ItemGroup>
     <Content Remove="wwwroot\**\*.*" />
-    <Content Remove="Pages\**\*.cshtml" />
-    <Content Remove="Views\**\*.cshtml" />
-    <Content Remove="Areas\**\*.cshtml" />
     <Content Remove="compilerconfig.json" />
     <Content Remove="Properties\launchSettings.json" />
     <None Include="compilerconfig.json" />

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj

@@ -17,9 +17,4 @@
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Bundling\Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Volo\Abp\AspNetCore\Mvc\UI\Widgets\Components\**\*.cshtml" />
-    <Content Remove="Volo\Abp\AspNetCore\Mvc\UI\Widgets\Components\**\*.cshtml" />
-  </ItemGroup>
-
 </Project>

framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj

@@ -14,11 +14,6 @@
     <RootNamespace />
   </PropertyGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Volo\**\*.cshtml" />
-    <Content Remove="Volo\**\*.cshtml" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="NUglify" Version="1.5.13" />
   </ItemGroup>

framework/src/Volo.Abp.AspNetCore.Mvc/Microsoft/Extensions/DependencyInjection/AbpMvcBuilderExtensions.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 
@@ -8,13 +9,23 @@ namespace Microsoft.Extensions.DependencyInjection
     {
         public static void AddApplicationPartIfNotExists(this IMvcBuilder mvcBuilder, Assembly assembly)
         {
-            if (mvcBuilder.PartManager.ApplicationParts.Any(
+            mvcBuilder.PartManager.ApplicationParts.AddIfNotContains(assembly);
+        }
+        
+        public static void AddApplicationPartIfNotExists(this IMvcCoreBuilder mvcCoreBuilder, Assembly assembly)
+        {
+            mvcCoreBuilder.PartManager.ApplicationParts.AddIfNotContains(assembly);
+        }
+        
+        public static void AddIfNotContains(this IList<ApplicationPart> applicationParts, Assembly assembly)
+        {
+            if (applicationParts.Any(
                 p => p is AssemblyPart assemblyPart && assemblyPart.Assembly == assembly))
             {
                 return;
             }
 
-            mvcBuilder.PartManager.ApplicationParts.Add(new AssemblyPart(assembly));
+            applicationParts.Add(new AssemblyPart(assembly));
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs

@@ -10,6 +10,7 @@ using Microsoft.Extensions.Options;
 using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Reflection;
@@ -75,14 +76,14 @@ namespace Volo.Abp.AspNetCore.Mvc
                     (int) HttpStatusCode.NotImplemented,
                     (int) HttpStatusCode.InternalServerError
                 };
-                
+
                 options.SupportedResponseTypes.AddIfNotContains(statusCodes.Select(statusCode => new ApiResponseType
                 {
                     Type = typeof(RemoteServiceErrorResponse),
                     StatusCode = statusCode
                 }));
             });
-            
+
             context.Services.PostConfigure<AbpAspNetCoreMvcOptions>(options =>
             {
                 if (options.MinifyGeneratedScript == null)
@@ -126,10 +127,10 @@ namespace Volo.Abp.AspNetCore.Mvc
                             return factory.Create(resourceType);
                         }
 
-                        return factory.CreateDefaultOrNull() ?? 
+                        return factory.CreateDefaultOrNull() ??
                                factory.Create(type);
                     };
-                })                
+                })
                 .AddViewLocalization(); //TODO: How to configure from the application? Also, consider to move to a UI module since APIs does not care about it.
 
             Configure<MvcRazorRuntimeCompilationOptions>(options =>
@@ -161,7 +162,7 @@ namespace Volo.Abp.AspNetCore.Mvc
             var application = context.Services.GetSingletonInstance<IAbpApplication>();
 
             partManager.FeatureProviders.Add(new AbpConventionalControllerFeatureProvider(application));
-            partManager.ApplicationParts.Add(new AssemblyPart(typeof(AbpAspNetCoreMvcModule).Assembly));
+            partManager.ApplicationParts.AddIfNotContains(typeof(AbpAspNetCoreMvcModule).Assembly);
 
             Configure<MvcOptions>(mvcOptions =>
             {
@@ -179,6 +180,14 @@ namespace Volo.Abp.AspNetCore.Mvc
             });
         }
 
+        public override void PostConfigureServices(ServiceConfigurationContext context)
+        {
+            ApplicationPartSorter.Sort(
+                context.Services.GetSingletonInstance<ApplicationPartManager>(),
+                context.Services.GetSingletonInstance<IModuleContainer>()
+            );
+        }
+
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             AddApplicationParts(context);
@@ -220,12 +229,7 @@ namespace Volo.Abp.AspNetCore.Mvc
         {
             foreach (var moduleAssembly in moduleAssemblies)
             {
-                if (partManager.ApplicationParts.OfType<AssemblyPart>().Any(p => p.Assembly == moduleAssembly))
+                partManager.ApplicationParts.AddIfNotContains(moduleAssembly);
-                {
-                    continue;
-                }
-
-                partManager.ApplicationParts.Add(new AssemblyPart(moduleAssembly));
             }
         }
     }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationPartSorter.cs

@@ -0,0 +1,167 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.AspNetCore.Mvc
+{
+    /// <summary>
+    /// This class is used to align order of the MVC Application Parts with the order of
+    /// ABP module dependencies.
+    /// </summary>
+    public static class ApplicationPartSorter
+    {
+        public static void Sort(ApplicationPartManager partManager, IModuleContainer moduleContainer)
+        {
+            /* Performing a double Reverse() to preserve the original order for non-sorted parts
+             */
+
+            var dependencyDictionary = CreateDependencyDictionary(partManager, moduleContainer);
+
+            var sortedParts = partManager
+                .ApplicationParts
+                .Reverse() //First Revers
+                .SortByDependencies(p => dependencyDictionary[p]);
+
+            sortedParts.Reverse(); //Reverse again
+
+            //Replace the original parts with the sorted parts
+            partManager.ApplicationParts.Clear();
+            foreach (var applicationPart in sortedParts)
+            {
+                partManager.ApplicationParts.Add(applicationPart);
+            }
+        }
+
+        private static Dictionary<ApplicationPart, List<ApplicationPart>> CreateDependencyDictionary(
+            ApplicationPartManager partManager, IModuleContainer moduleContainer)
+        {
+            var dependencyDictionary = new Dictionary<ApplicationPart, List<ApplicationPart>>();
+
+            foreach (var applicationPart in partManager.ApplicationParts)
+            {
+                dependencyDictionary[applicationPart] =
+                    CreateDependencyList(applicationPart, partManager, moduleContainer);
+            }
+
+            return dependencyDictionary;
+        }
+
+        private static List<ApplicationPart> CreateDependencyList(
+            ApplicationPart applicationPart,
+            ApplicationPartManager partManager,
+            IModuleContainer moduleContainer)
+        {
+            var list = new List<ApplicationPart>();
+
+            if (applicationPart is AssemblyPart assemblyPart)
+            {
+                AddDependencies(list, assemblyPart, partManager, moduleContainer);
+            }
+            else if (applicationPart is CompiledRazorAssemblyPart compiledRazorAssemblyPart)
+            {
+                AddDependencies(list, compiledRazorAssemblyPart, partManager, moduleContainer);
+            }
+
+            return list;
+        }
+
+        private static void AddDependencies(
+            List<ApplicationPart> list,
+            AssemblyPart assemblyPart,
+            ApplicationPartManager partManager,
+            IModuleContainer moduleContainer)
+        {
+            var dependedAssemblyParts = GetDependedAssemblyParts(
+                partManager,
+                moduleContainer,
+                assemblyPart
+            );
+            
+            list.AddRange(dependedAssemblyParts);
+
+            foreach (var dependedAssemblyPart in dependedAssemblyParts)
+            {
+                var viewsPart = GetViewsPartOrNull(partManager, dependedAssemblyPart);
+                if (viewsPart != null)
+                {
+                    list.Add(viewsPart);
+                }
+            }
+        }
+        
+        private static void AddDependencies(
+            List<ApplicationPart> list,
+            CompiledRazorAssemblyPart compiledRazorAssemblyPart,
+            ApplicationPartManager partManager,
+            IModuleContainer moduleContainer)
+        {
+            if (!compiledRazorAssemblyPart.Name.EndsWith(".Views"))
+            {
+                return;
+            }
+
+            var originalAssemblyPart = GetOriginalAssemblyPartOrNull(compiledRazorAssemblyPart, partManager);
+            if (originalAssemblyPart == null)
+            {
+                return;
+            }
+
+            list.Add(originalAssemblyPart);
+        }
+        
+        private static AssemblyPart[] GetDependedAssemblyParts(
+            ApplicationPartManager partManager,
+            IModuleContainer moduleContainer,
+            AssemblyPart assemblyPart)
+        {
+            var moduleDescriptor = GetModuleDescriptorForAssemblyOrNull(moduleContainer, assemblyPart.Assembly);
+            if (moduleDescriptor == null)
+            {
+                return Array.Empty<AssemblyPart>();
+            }
+
+            var moduleDependedAssemblies = moduleDescriptor
+                .Dependencies
+                .Select(d => d.Assembly)
+                .ToArray();
+            
+            return partManager.ApplicationParts
+                .OfType<AssemblyPart>()
+                .Where(a => a.Assembly.IsIn(moduleDependedAssemblies))
+                .Distinct()
+                .ToArray();
+        }
+
+        private static CompiledRazorAssemblyPart GetViewsPartOrNull(ApplicationPartManager partManager,
+            ApplicationPart assemblyPart)
+        {
+            var viewsAssemblyName = assemblyPart.Name + ".Views";
+            return partManager
+                .ApplicationParts
+                .OfType<CompiledRazorAssemblyPart>()
+                .FirstOrDefault(p => p.Name == viewsAssemblyName);
+        }
+
+        private static AssemblyPart GetOriginalAssemblyPartOrNull(
+            CompiledRazorAssemblyPart compiledRazorAssemblyPart,
+            ApplicationPartManager partManager)
+        {
+            var originalAssemblyName = compiledRazorAssemblyPart.Name.RemovePostFix(".Views");
+            return partManager.ApplicationParts
+                .OfType<AssemblyPart>()
+                .FirstOrDefault(p => p.Name == originalAssemblyName);
+        }
+
+        private static IAbpModuleDescriptor GetModuleDescriptorForAssemblyOrNull(
+            IModuleContainer moduleContainer,
+            Assembly assembly)
+        {
+            return moduleContainer
+                .Modules
+                .FirstOrDefault(m => m.Assembly == assembly);
+        }
+    }
+}

framework/src/Volo.Abp.Core/System/Collections/Generic/AbpListExtensions.cs

@@ -180,7 +180,10 @@ namespace System.Collections.Generic
         /// <typeparam name="T">The type of the members of values.</typeparam>
         /// <param name="source">A list of objects to sort</param>
         /// <param name="getDependencies">Function to resolve the dependencies</param>
-        /// <returns></returns>
+        /// <returns>
+        /// Returns a new list ordered by dependencies.
+        /// If A depends on B, then B will come before than A in the resulting list. 
+        /// </returns>
         public static List<T> SortByDependencies<T>(this IEnumerable<T> source, Func<T, IEnumerable<T>> getDependencies)
         {
             /* See: http://www.codeproject.com/Articles/869059/Topological-sorting-in-Csharp

framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.DependencyInjection;
@@ -42,6 +43,7 @@ namespace Volo.Abp
             services.AddCoreAbpServices(this, options);
 
             Modules = LoadModules(services, options);
+            ConfigureServices();
         }
 
         public virtual void Shutdown()
@@ -75,7 +77,7 @@ namespace Volo.Abp
             }
         }
 
-        private IReadOnlyList<IAbpModuleDescriptor> LoadModules(IServiceCollection services, AbpApplicationCreationOptions options)
+        protected virtual IReadOnlyList<IAbpModuleDescriptor> LoadModules(IServiceCollection services, AbpApplicationCreationOptions options)
         {
             return services
                 .GetSingletonInstance<IModuleLoader>()
@@ -85,5 +87,75 @@ namespace Volo.Abp
                     options.PlugInSources
                 );
         }
+        
+        //TODO: We can extract a new class for this
+        protected virtual void ConfigureServices()
+        {
+            var context = new ServiceConfigurationContext(Services);
+            Services.AddSingleton(context);
+
+            foreach (var module in Modules)
+            {
+                if (module.Instance is AbpModule abpModule)
+                {
+                    abpModule.ServiceConfigurationContext = context;
+                }
+            }
+
+            //PreConfigureServices
+            foreach (var module in Modules.Where(m => m.Instance is IPreConfigureServices))
+            {
+                try
+                {
+                    ((IPreConfigureServices)module.Instance).PreConfigureServices(context);
+                }
+                catch (Exception ex)
+                {
+                    throw new AbpInitializationException($"An error occurred during {nameof(IPreConfigureServices.PreConfigureServices)} phase of the module {module.Type.AssemblyQualifiedName}. See the inner exception for details.", ex);
+                }
+            }
+
+            //ConfigureServices
+            foreach (var module in Modules)
+            {
+                if (module.Instance is AbpModule abpModule)
+                {
+                    if (!abpModule.SkipAutoServiceRegistration)
+                    {
+                        Services.AddAssembly(module.Type.Assembly);
+                    }
+                }
+
+                try
+                {
+                    module.Instance.ConfigureServices(context);
+                }
+                catch (Exception ex)
+                {
+                    throw new AbpInitializationException($"An error occurred during {nameof(IAbpModule.ConfigureServices)} phase of the module {module.Type.AssemblyQualifiedName}. See the inner exception for details.", ex);
+                }
+            }
+
+            //PostConfigureServices
+            foreach (var module in Modules.Where(m => m.Instance is IPostConfigureServices))
+            {
+                try
+                {
+                    ((IPostConfigureServices)module.Instance).PostConfigureServices(context);
+                }
+                catch (Exception ex)
+                {
+                    throw new AbpInitializationException($"An error occurred during {nameof(IPostConfigureServices.PostConfigureServices)} phase of the module {module.Type.AssemblyQualifiedName}. See the inner exception for details.", ex);
+                }
+            }
+
+            foreach (var module in Modules)
+            {
+                if (module.Instance is AbpModule abpModule)
+                {
+                    abpModule.ServiceConfigurationContext = null;
+                }
+            }
+        }
     }
 }

framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLoader.cs

@@ -20,7 +20,6 @@ namespace Volo.Abp.Modularity
             var modules = GetDescriptors(services, startupModuleType, plugInSources);
 
             modules = SortByDependency(modules, startupModuleType);
-            ConfigureServices(modules, services);
 
             return modules.ToArray();
         }
@@ -89,75 +88,6 @@ namespace Volo.Abp.Modularity
             return module;
         }
 
-        protected virtual void ConfigureServices(List<IAbpModuleDescriptor> modules, IServiceCollection services)
-        {
-            var context = new ServiceConfigurationContext(services);
-            services.AddSingleton(context);
-
-            foreach (var module in modules)
-            {
-                if (module.Instance is AbpModule abpModule)
-                {
-                    abpModule.ServiceConfigurationContext = context;
-                }
-            }
-
-            //PreConfigureServices
-            foreach (var module in modules.Where(m => m.Instance is IPreConfigureServices))
-            {
-                try
-                {
-                    ((IPreConfigureServices)module.Instance).PreConfigureServices(context);
-                }
-                catch (Exception ex)
-                {
-                    throw new AbpInitializationException($"An error occurred during {nameof(IPreConfigureServices.PreConfigureServices)} phase of the module {module.Type.AssemblyQualifiedName}. See the inner exception for details.", ex);
-                }
-            }
-
-            //ConfigureServices
-            foreach (var module in modules)
-            {
-                if (module.Instance is AbpModule abpModule)
-                {
-                    if (!abpModule.SkipAutoServiceRegistration)
-                    {
-                        services.AddAssembly(module.Type.Assembly);
-                    }
-                }
-
-                try
-                {
-                    module.Instance.ConfigureServices(context);
-                }
-                catch (Exception ex)
-                {
-                    throw new AbpInitializationException($"An error occurred during {nameof(IAbpModule.ConfigureServices)} phase of the module {module.Type.AssemblyQualifiedName}. See the inner exception for details.", ex);
-                }
-            }
-
-            //PostConfigureServices
-            foreach (var module in modules.Where(m => m.Instance is IPostConfigureServices))
-            {
-                try
-                {
-                    ((IPostConfigureServices)module.Instance).PostConfigureServices(context);
-                }
-                catch (Exception ex)
-                {
-                    throw new AbpInitializationException($"An error occurred during {nameof(IPostConfigureServices.PostConfigureServices)} phase of the module {module.Type.AssemblyQualifiedName}. See the inner exception for details.", ex);
-                }
-            }
-
-            foreach (var module in modules)
-            {
-                if (module.Instance is AbpModule abpModule)
-                {
-                    abpModule.ServiceConfigurationContext = null;
-                }
-            }
-        }
-
         protected virtual void SetDependencies(List<AbpModuleDescriptor> modules, AbpModuleDescriptor module)
         {
             foreach (var dependedModuleType in AbpModuleHelper.FindDependedModuleTypes(module.Type))

framework/test/Volo.Abp.Core.Tests/System/Collections/Generic/AbpListExtensions_Tests.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using Shouldly;
+using Volo.Abp;
 using Xunit;
 
 namespace System.Collections.Generic
@@ -171,5 +172,36 @@ namespace System.Collections.Generic
             list[1].ShouldBe(42);
             list[2].ShouldBe(3);
         }
+
+        [Fact]
+        public void SortByDependencies()
+        {
+            var dependencies = new Dictionary<char, char[]>
+            {
+                {'A', new[] {'B', 'G'}},
+                {'B', new[] {'C', 'E'}},
+                {'C', new[] {'D'}},
+                {'D', new char[0]},
+                {'E', new[] {'C', 'F'}},
+                {'F', new[] {'C'}},
+                {'G', new[] {'F'}}
+            };
+
+            for (int i = 0; i < 3; i++)
+            {
+                var list = RandomHelper
+                    .GenerateRandomizedList(new char[] {'A', 'B', 'C', 'D', 'E', 'F', 'G'});
+                
+                list = list.SortByDependencies(c => dependencies[c]);
+
+                foreach (var dependency in dependencies)
+                {
+                    foreach (var dependedValue in dependency.Value)
+                    {
+                        list.IndexOf(dependency.Key).ShouldBeGreaterThan(list.IndexOf(dependedValue));
+                    }
+                }
+            }
+        }
     }
-}
+}

modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj

@@ -17,10 +17,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.css" />
     <EmbeddedResource Include="Pages\**\*.js" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Properties\launchSettings.json" />

modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.csproj

@@ -17,22 +17,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Modules\**\*.cshtml" />
     <EmbeddedResource Include="Modules\**\*.js" />
     <EmbeddedResource Include="Modules\**\*.css" />
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Pages\**\*.css" />
-    <Content Remove="Modules\**\*.cshtml" />
     <Content Remove="Modules\**\*.js" />
     <Content Remove="Modules\**\*.css" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Properties\launchSettings.json" />
     <None Include="Properties\launchSettings.json" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\identity\src\Volo.Abp.Identity.AspNetCore\Volo.Abp.Identity.AspNetCore.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />

modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj

@@ -23,10 +23,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Pages\**\*.css" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="compilerconfig.json" />

modules/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj

@@ -20,11 +20,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Pages\**\*.css" />
     <EmbeddedResource Include="Pages\**\*.scss" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.scss" />

modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj

@@ -23,10 +23,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.css" />
     <EmbeddedResource Include="Pages\**\*.js" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Properties\launchSettings.json" />

modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj

@@ -24,14 +24,12 @@
     <PackageReference Include="Markdig.Signed" Version="0.18.0" />
     <PackageReference Include="Scriban" Version="2.1.1" />
   </ItemGroup>
-  
+
-  
+
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.css" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Localization\Resources\**\*.json" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Localization\Resources\**\*.json" />

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj

@@ -12,10 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Pages\**\*.css" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
   </ItemGroup>

modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj

@@ -16,13 +16,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Pages\**\*.css" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="compilerconfig.json" />

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.csproj

@@ -13,10 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Pages\**\*.css" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
   </ItemGroup>

modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.csproj

@@ -20,10 +20,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Pages\**\*.css" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Properties\launchSettings.json" />

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/_ViewImports.cshtml

@@ -1,2 +1,4 @@
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj

@@ -13,10 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Pages\**\*.css" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="compilerconfig.json" />

samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagement.Web.csproj

@@ -9,11 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.css" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Localization\Resources\**\*.json" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Localization\Resources\**\*.json" />

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj

@@ -20,11 +20,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.css" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="wwwroot\**\*.*" />
-    <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="wwwroot\**\*.*" />