Merge pull request #17 from abpframework/master

merge

build-all.ps1

@@ -21,7 +21,6 @@ $solutionPaths = (
     "modules/client-simulation",
     "abp_io",
     "templates/mvc-module",
-    "templates/service",
     "templates/mvc",
     "samples/MicroserviceDemo"
 )

docs/zh-Hans/Samples/Microservice-Demo.md

@@ -116,11 +116,29 @@ ABP框架的主要目标之一就是提供[便捷的基础设施来创建微服
 * 在`samples\MicroserviceDemo`文件夹中的命令行运行`dotnet restore`命令.
 * 在Visual Studio中构建解决方案.
 
-#### 还原数据库
+#### 创建数据库
 
-在`samples\MicroserviceDemo\databases`文件夹中打开`MsDemo_Identity.zip`和`MsDemo_ProductManagement.zip`并恢复到SQL Server.
+MongoDB 数据库是动态创建的，但是你需要创建 SQL server 数据库的结构。其实你可以很轻松的创建数据库，因为这个解决方案配置了使用 Entity Core Code First 来做迁移。
 
-> 请注意:这些数据库在解决方案中具有EF Core迁移,但它们没有种子数据,尤其是IdentityServer4所需的配置. 因此,恢复数据库要容易得多.
+这个解决方案中有两个 SQL server 数据库。
+
+##### MsDemo_Identity 数据库
+
+* 右键 `AuthServer.Host` 项目，然后点击 `设置为启动项目`.
+* 打开 **程序包管理器控制台** (工具 -> NuGet 包管理器 -> 程序包管理器控制台)
+* 选择 `AuthServer.Host` 成为 **默认项目**.
+* 执行 `Update-Database` 命令.
+
+![microservice-sample-update-database-authserver](../images/microservice-sample-update-database-authserver.png)
+
+##### MsDemo_ProductManagement
+
+* 右键 `ProductService.Host` 项目，然后点击 `设置为启动项目`.
+* 打开 **程序包管理器控制台** (工具 -> NuGet 包管理器 -> 程序包管理器控制台)
+* 选择 `ProductService.Host` 成为 **默认项目**.
+* 执行 `Update-Database` 命令.
+
+![microservice-sample-update-database-products](../images/microservice-sample-update-database-products.png)
 
 #### 运行项目
 

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

@@ -0,0 +1,63 @@
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Versioning;
+using Volo.Abp.ApiVersioning;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.Conventions;
+using Volo.Abp.AspNetCore.Mvc.Versioning;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class AbpApiVersioningExtensions
+    {
+        public static IServiceCollection AddAbpApiVersioning(this IServiceCollection services, Action<ApiVersioningOptions> setupAction)
+        {
+            services.AddTransient<IRequestedApiVersion, HttpContextRequestedApiVersion>();
+            services.AddTransient<IApiControllerSpecification, AbpConventionalApiControllerSpecification>();
+
+            services.AddApiVersioning(setupAction);
+
+            return services;
+        }
+
+        public static void ConfigureAbp(this ApiVersioningOptions options, AbpAspNetCoreMvcOptions mvcOptions)
+        {
+            foreach (var setting in mvcOptions.ConventionalControllers.ConventionalControllerSettings)
+            {
+                if (setting.ApiVersionConfigurer == null)
+                {
+                    ConfigureApiVersionsByConvention(options, setting);
+                }
+                else
+                {
+                    setting.ApiVersionConfigurer.Invoke(options);
+                }
+            }
+        }
+
+        private static void ConfigureApiVersionsByConvention(ApiVersioningOptions options, ConventionalControllerSetting setting)
+        {
+            foreach (var controllerType in setting.ControllerTypes)
+            {
+                var controllerBuilder = options.Conventions.Controller(controllerType);
+
+                if (setting.ApiVersions.Any())
+                {
+                    foreach (var apiVersion in setting.ApiVersions)
+                    {
+                        controllerBuilder.HasApiVersion(apiVersion);
+                    }
+                }
+                else
+                {
+                    if (!controllerType.IsDefined(typeof(ApiVersionAttribute), true))
+                    {
+                        controllerBuilder.IsApiVersionNeutral();
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -1,61 +0,0 @@
-using System.Linq;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Versioning;
-using Volo.Abp.ApiVersioning;
-using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc.Conventions;
-using Volo.Abp.AspNetCore.Mvc.Versioning;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public static class AbpApiVersioningOptionsExtensions
-    {
-        public static void ConfigureAbp(this ApiVersioningOptions options, IServiceCollection services)
-        {
-            //TODO: Use new builder will be released with Api Versioning 2.1 instead of reflection!
-
-            services.AddTransient<IRequestedApiVersion, HttpContextRequestedApiVersion>();
-
-            services.Configure<AbpAspNetCoreMvcOptions>(op =>
-            {
-                //TODO: Configuring api version should be done directly inside ConfigureAbp,
-                //TODO: not in a callback that will be called by MVC later! For that, we immediately need to controllerAssemblySettings
-
-                foreach (var setting in op.ConventionalControllers.ConventionalControllerSettings)
-                {
-                    if (setting.ApiVersionConfigurer == null)
-                    {
-                        ConfigureApiVersionsByConvention(options, setting);
-                    }
-                    else
-                    {
-                        setting.ApiVersionConfigurer.Invoke(options);
-                    }
-                }
-            });
-        }
-
-        private static void ConfigureApiVersionsByConvention(ApiVersioningOptions options, ConventionalControllerSetting setting)
-        {
-            foreach (var controllerType in setting.ControllerTypes)
-            {
-                var controllerBuilder = options.Conventions.Controller(controllerType);
-
-                if (setting.ApiVersions.Any())
-                {
-                    foreach (var apiVersion in setting.ApiVersions)
-                    {
-                        controllerBuilder.HasApiVersion(apiVersion);
-                    }
-                }
-                else
-                {
-                    if (!controllerType.IsDefined(typeof(ApiVersionAttribute), true))
-                    {
-                        controllerBuilder.IsApiVersionNeutral();
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -1,34 +1,36 @@
-using System;
+using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
-using Microsoft.AspNetCore.Mvc.Razor;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Modularity;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using Volo.Abp.ApiVersioning;
 using Volo.Abp.AspNetCore.Mvc.Conventions;
 using Volo.Abp.AspNetCore.Mvc.DependencyInjection;
+using Volo.Abp.AspNetCore.Mvc.Json;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.VirtualFileSystem;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Modeling;
 using Volo.Abp.Localization;
+using Volo.Abp.Modularity;
 using Volo.Abp.UI;
 
 namespace Volo.Abp.AspNetCore.Mvc
 {
     [DependsOn(
-        typeof(AbpAspNetCoreModule), 
+        typeof(AbpAspNetCoreModule),
-        typeof(AbpLocalizationModule), 
+        typeof(AbpLocalizationModule),
-        typeof(AbpApiVersioningAbstractionsModule), 
+        typeof(AbpApiVersioningAbstractionsModule),
         typeof(AbpAspNetCoreMvcContractsModule),
         typeof(AbpUiModule)
         )]
@@ -109,6 +111,11 @@ namespace Volo.Abp.AspNetCore.Mvc
             {
                 mvcOptions.AddAbp(context.Services);
             });
+
+            Configure<MvcJsonOptions>(jsonOptions =>
+            {
+                jsonOptions.SerializerSettings.ContractResolver = new AbpMvcJsonContractResolver(context.Services);
+            });
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)

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

@@ -85,7 +85,7 @@ namespace Volo.Abp.AspNetCore.Mvc
                 method,
                 apiDescription.RelativePath,
                 apiDescription.HttpMethod,
-                setting?.ApiVersions.Select(v => v.ToString()).ToList() ?? new List<string>() //TODO: Also get from ApiVersion attributes if available..?
+                GetSupportedVersions(controllerType, method, setting)
             ));
 
             AddParameterDescriptionsToModel(actionModel, method, apiDescription);
@@ -126,6 +126,29 @@ namespace Volo.Abp.AspNetCore.Mvc
             return methodNameBuilder.ToString();
         }
 
+        private static List<string> GetSupportedVersions(Type controllerType, MethodInfo method, ConventionalControllerSetting setting)
+        {
+            var supportedVersions = new List<ApiVersion>();
+
+            var mapToAttributes = method.GetCustomAttributes<MapToApiVersionAttribute>().ToArray();
+            if (mapToAttributes.Any())
+            {
+                supportedVersions.AddRange(
+                    mapToAttributes.SelectMany(a => a.Versions)
+                );
+            }
+            else
+            {
+                supportedVersions.AddRange(
+                    controllerType.GetCustomAttributes<ApiVersionAttribute>().SelectMany(a => a.Versions)
+                );
+
+                setting?.ApiVersions.ForEach(supportedVersions.Add);
+            }
+
+            return supportedVersions.Select(v => v.ToString()).Distinct().ToList();
+        }
+
         private void AddParameterDescriptionsToModel(ActionApiDescriptionModel actionModel, MethodInfo method, ApiDescription apiDescription)
         {
             if (!apiDescription.ParameterDescriptions.Any())

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpConventionalApiControllerSpecification.cs

@@ -0,0 +1,25 @@
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.Extensions.Options;
+
+namespace Volo.Abp.AspNetCore.Mvc.Conventions
+{
+    public class AbpConventionalApiControllerSpecification : IApiControllerSpecification
+    {
+        private readonly AbpAspNetCoreMvcOptions _options;
+
+        public AbpConventionalApiControllerSpecification(IOptions<AbpAspNetCoreMvcOptions> options)
+        {
+            _options = options.Value;
+        }
+
+        public bool IsSatisfiedBy(ControllerModel controller)
+        {
+            var configuration = _options
+                .ConventionalControllers
+                .ConventionalControllerSettings
+                .GetSettingOrNull(controller.ControllerType.AsType());
+
+             return configuration != null;
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/AbpMvcJsonContractResolver.cs

@@ -0,0 +1,44 @@
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using System;
+using System.Reflection;
+using Volo.Abp.Json.Newtonsoft;
+using Volo.Abp.Reflection;
+using Volo.Abp.Timing;
+
+namespace Volo.Abp.AspNetCore.Mvc.Json
+{
+    public class AbpMvcJsonContractResolver : CamelCasePropertyNamesContractResolver
+    {
+        private readonly Lazy<AbpJsonIsoDateTimeConverter> _dateTimeConverter;
+
+        public AbpMvcJsonContractResolver(IServiceCollection services)
+        {
+            _dateTimeConverter = services.GetServiceLazy<AbpJsonIsoDateTimeConverter>();
+        }
+
+        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+        {
+            JsonProperty property = base.CreateProperty(member, memberSerialization);
+
+            ModifyProperty(member, property);
+
+            return property;
+        }
+
+        protected virtual void ModifyProperty(MemberInfo member, JsonProperty property)
+        {
+            if (property.PropertyType != typeof(DateTime) && property.PropertyType != typeof(DateTime?))
+            {
+                return;
+            }
+
+            if (ReflectionHelper.GetSingleAttributeOfMemberOrDeclaringTypeOrDefault<DisableDateTimeNormalizationAttribute>(member) == null)
+            {
+                property.Converter = _dateTimeConverter.Value;
+            }
+
+        }
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs

@@ -10,6 +10,8 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
         private readonly string _solutionFilePath;
         private readonly string _projectFolderPath;
 
+        private string ProjectNameWithQuotes => $"\"{_projectName}\"";
+
         public RemoveProjectFromSolutionStep(
             string projectName,
             string solutionFilePath = null,
@@ -59,7 +61,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
         {
             foreach (var solutionFileLine in solutionFileLines)
             {
-                if (solutionFileLine.Contains(_projectName))
+                if (solutionFileLine.Contains(ProjectNameWithQuotes))
                 {
                     var curlyBracketStartIndex = solutionFileLine.LastIndexOf("{", StringComparison.OrdinalIgnoreCase);
                     var curlyBracketEndIndex = solutionFileLine.LastIndexOf("}", StringComparison.OrdinalIgnoreCase);

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuilder.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Volo.Abp.Cli.ProjectBuilding.Building;
-using Volo.Abp.Cli.Utils;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Cli.ProjectBuilding

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs

@@ -1,7 +1,7 @@
 using System;
 using Volo.Abp.Cli.ProjectBuilding.Building;
-using Volo.Abp.Cli.ProjectBuilding.Templates;
 using Volo.Abp.Cli.ProjectBuilding.Templates.Mvc;
+using Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Cli.ProjectBuilding
@@ -21,8 +21,6 @@ namespace Volo.Abp.Cli.ProjectBuilding
                     return new MvcTemplate();
                 case MvcModuleTemplate.TemplateName:
                     return new MvcModuleTemplate();
-                case ServiceTemplate.TemplateName:
-                    return new ServiceTemplate();
                 default:
                     throw new Exception("There is no template found with given name: " + name);
             }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcModule/MvcModuleTemplate.cs

@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+using Volo.Abp.Cli.ProjectBuilding.Building;
+using Volo.Abp.Cli.ProjectBuilding.Building.Steps;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule
+{
+    public class MvcModuleTemplate : TemplateInfo
+    {
+        /// <summary>
+        /// "mvc-module".
+        /// </summary>
+        public const string TemplateName = "mvc-module";
+
+        public MvcModuleTemplate()
+            : base(TemplateName)
+        {
+            
+        }
+
+        public override IEnumerable<ProjectBuildPipelineStep> GetCustomSteps(ProjectBuildContext context)
+        {
+            var steps = new List<ProjectBuildPipelineStep>();
+
+            DeleteUnrelatedProjects(context, steps);
+
+            return steps;
+        }
+
+        private void DeleteUnrelatedProjects(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+        {
+            if (context.BuildArgs.ExtraProperties.ContainsKey("no-ui"))
+            {
+                steps.Add(new RemoveProjectFromSolutionStep(
+                    "MyCompanyName.MyProjectName.Web"
+                ));
+
+                steps.Add(new RemoveProjectFromSolutionStep(
+                    "MyCompanyName.MyProjectName.Web.Host",
+                    projectFolderPath: "/host/MyCompanyName.MyProjectName.Web.Host"
+                ));
+
+                steps.Add(new RemoveProjectFromSolutionStep(
+                    "MyCompanyName.MyProjectName.Web.Unified",
+                    projectFolderPath: "/host/MyCompanyName.MyProjectName.Web.Unified"
+                ));
+            }
+        }
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcModuleTemplate.cs

@@ -1,18 +0,0 @@
-using Volo.Abp.Cli.ProjectBuilding.Building;
-
-namespace Volo.Abp.Cli.ProjectBuilding.Templates
-{
-    public class MvcModuleTemplate : TemplateInfo
-    {
-        /// <summary>
-        /// "mvc-module".
-        /// </summary>
-        public const string TemplateName = "mvc-module";
-
-        public MvcModuleTemplate()
-            : base(TemplateName)
-        {
-            
-        }
-    }
-}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/ServiceTemplate.cs

@@ -1,18 +0,0 @@
-using Volo.Abp.Cli.ProjectBuilding.Building;
-
-namespace Volo.Abp.Cli.ProjectBuilding.Templates
-{
-    public class ServiceTemplate : TemplateInfo
-    {
-        /// <summary>
-        /// "service".
-        /// </summary>
-        public const string TemplateName = "service";
-
-        public ServiceTemplate()
-            : base(TemplateName)
-        {
-
-        }
-    }
-}

framework/src/Volo.Abp.Emailing/Volo.Abp.Emailing.csproj

@@ -14,8 +14,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Volo\Abp\Emailing\Templates\*.html" />
+    <EmbeddedResource Include="Volo\Abp\Emailing\Templates\DefaultEmailTemplates\*\*.tpl" />
-    <None Remove="Volo\Abp\Emailing\Templates\*.html" />
+    <None Remove="Volo\Abp\Emailing\Templates\DefaultEmailTemplates\*\*.tpl" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Scriban" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup>

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs

@@ -1,6 +1,8 @@
-using Volo.Abp.BackgroundJobs;
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.BackgroundJobs;
 using Volo.Abp.Emailing.Templates;
-using Volo.Abp.Emailing.Templates.Virtual;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.Settings;
@@ -16,6 +18,11 @@ namespace Volo.Abp.Emailing
         )]
     public class AbpEmailingModule : AbpModule
     {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            AutoAddDefinitionProviders(context.Services);
+        }
+
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             Configure<VirtualFileSystemOptions>(options =>
@@ -27,18 +34,42 @@ namespace Volo.Abp.Emailing
             {
                 options.AddJob<BackgroundEmailSendingJob>();
             });
+        }
 
-            Configure<EmailTemplateOptions>(options =>
+        private static void AutoAddDefinitionProviders(IServiceCollection services)
+        {
+            var definitionProviders = new List<Type>();
+
+            services.OnRegistred(context =>
             {
-                options.Templates
+
-                    .Add(
+                if (typeof(IEmailTemplateDefinitionProvider).IsAssignableFrom(context.ImplementationType))
-                        new EmailTemplateDefinition(StandardEmailTemplates.DefaultLayout, isLayout: true, layout: null)
+                {
-                            .SetVirtualFilePath("/Volo/Abp/Emailing/Templates/DefaultLayout.html")
+                    definitionProviders.Add(context.ImplementationType);
-                    ).Add(
+                }
-                        new EmailTemplateDefinition(StandardEmailTemplates.SimpleMessage)
-                            .SetVirtualFilePath("/Volo/Abp/Emailing/Templates/SimpleMessageTemplate.html")
-                    );
             });
+
+            services.Configure<EmailTemplateOptions>(options =>
+            {
+                options.DefinitionProviders.AddIfNotContains(definitionProviders);
+            });
+        }
+
+        public override void OnApplicationInitialization(ApplicationInitializationContext context)
+        {
+            using (var scope = context.ServiceProvider.CreateScope())
+            {
+                var emailTemplateDefinitionManager =
+                    scope.ServiceProvider.GetRequiredService<IEmailTemplateDefinitionManager>();
+
+                foreach (var templateDefinition in emailTemplateDefinitionManager.GetAll())
+                {
+                    foreach (var contributor in templateDefinition.Contributors)
+                    {
+                        contributor.Initialize(new EmailTemplateInitializationContext(templateDefinition, scope.ServiceProvider));
+                    }
+                }
+            }
         }
     }
 }

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/DefaultEmailTemplateProvider.cs

@@ -0,0 +1,16 @@
+using Volo.Abp.Emailing.Templates.VirtualFiles;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public class DefaultEmailTemplateProvider : EmailTemplateDefinitionProvider
+    {
+        public override void Define(IEmailTemplateDefinitionContext context)
+        {
+            context.Add(new EmailTemplateDefinition(StandardEmailTemplates.DefaultLayout, isLayout: true, layout: null)
+                .AddTemplateVirtualFiles("/Volo/Abp/Emailing/Templates/DefaultEmailTemplates/Layout"));
+
+            context.Add(new EmailTemplateDefinition(StandardEmailTemplates.SimpleMessage)
+                .AddTemplateVirtualFiles("/Volo/Abp/Emailing/Templates/DefaultEmailTemplates/Message"));
+        }
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateContributorList.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public class EmailTemplateContributorList : List<IEmailTemplateContributor>
+    {
+        public string GetOrNull(string cultureName)
+        {
+            foreach (var contributor in this.AsQueryable().Reverse())
+            {
+                var templateString = contributor.GetOrNull(cultureName);
+                if (templateString != null)
+                {
+                    return templateString;
+                }
+            }
+
+            return null;
+        }
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinition.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace Volo.Abp.Emailing.Templates
@@ -16,29 +15,22 @@ namespace Volo.Abp.Emailing.Templates
 
         public Type LocalizationResource { get; set; }
 
-        public Dictionary<string, object> Properties { get; }
+        public EmailTemplateContributorList Contributors { get; }
-
+
-        /// <summary>
+        public string DefaultCultureName { get; }
-        /// Gets/sets a key-value on the <see cref="Properties"/>.
+
-        /// </summary>
+        public bool SingleTemplateFile { get; }
-        /// <param name="name">Name of the property</param>
-        /// <returns>
-        /// Returns the value in the <see cref="Properties"/> dictionary by given <see cref="name"/>.
-        /// Returns null if given <see cref="name"/> is not present in the <see cref="Properties"/> dictionary.
-        /// </returns>
-        public object this[string name]
-        {
-            get => Properties.GetOrDefault(name);
-            set => Properties[name] = value;
-        }
 
-        public EmailTemplateDefinition([NotNull]string name, Type localizationResource = null, bool isLayout = false, string layout = DefaultLayoutPlaceHolder)
+        public EmailTemplateDefinition([NotNull] string name, Type localizationResource = null, bool isLayout = false,
+            string layout = DefaultLayoutPlaceHolder, string defaultCultureName = null, bool singleTemplateFile = false)
         {
             Name = Check.NotNullOrWhiteSpace(name, nameof(name));
-            Properties = new Dictionary<string, object>();
             LocalizationResource = localizationResource;
+            Contributors = new EmailTemplateContributorList();
             IsLayout = isLayout;
             Layout = layout;
+            DefaultCultureName = defaultCultureName;
+            SingleTemplateFile = singleTemplateFile;
         }
     }
 }

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionContext.cs

@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Collections.Immutable;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public class EmailTemplateDefinitionContext : IEmailTemplateDefinitionContext
+    {
+        protected Dictionary<string, EmailTemplateDefinition> EmailTemplates { get; }
+
+        public EmailTemplateDefinitionContext(Dictionary<string, EmailTemplateDefinition> emailTemplates)
+        {
+            EmailTemplates = emailTemplates;
+        }
+
+        public virtual EmailTemplateDefinition GetOrNull(string name)
+        {
+            return EmailTemplates.GetOrDefault(name);
+        }
+
+        public virtual IReadOnlyList<EmailTemplateDefinition> GetAll()
+        {
+            return EmailTemplates.Values.ToImmutableList();
+        }
+
+        public virtual void Add(params EmailTemplateDefinition[] definitions)
+        {
+            if (definitions.IsNullOrEmpty())
+            {
+                return;
+            }
+
+            foreach (var definition in definitions)
+            {
+                EmailTemplates[definition.Name] = definition;
+            }
+        }
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public class EmailTemplateDefinitionManager : IEmailTemplateDefinitionManager, ISingletonDependency
+    {
+        protected Lazy<IDictionary<string, EmailTemplateDefinition>> EmailTemplateDefinitions { get; }
+
+        protected EmailTemplateOptions Options { get; }
+
+        protected IServiceProvider ServiceProvider { get; }
+
+        public EmailTemplateDefinitionManager(
+            IOptions<EmailTemplateOptions> options,
+            IServiceProvider serviceProvider)
+        {
+            ServiceProvider = serviceProvider;
+            Options = options.Value;
+
+            EmailTemplateDefinitions =
+                new Lazy<IDictionary<string, EmailTemplateDefinition>>(CreateEmailTemplateDefinitions, true);
+        }
+
+        public virtual EmailTemplateDefinition Get(string name)
+        {
+            Check.NotNull(name, nameof(name));
+
+            var template = GetOrNull(name);
+
+            if (template == null)
+            {
+                throw new AbpException("Undefined template: " + name);
+            }
+
+            return template;
+        }
+
+        public virtual IReadOnlyList<EmailTemplateDefinition> GetAll()
+        {
+            return EmailTemplateDefinitions.Value.Values.ToImmutableList();
+        }
+
+        public virtual EmailTemplateDefinition GetOrNull(string name)
+        {
+            return EmailTemplateDefinitions.Value.GetOrDefault(name);
+        }
+
+        protected virtual IDictionary<string, EmailTemplateDefinition> CreateEmailTemplateDefinitions()
+        {
+            var templates = new Dictionary<string, EmailTemplateDefinition>();
+
+            using (var scope = ServiceProvider.CreateScope())
+            {
+                var providers = Options
+                    .DefinitionProviders
+                    .Select(p => scope.ServiceProvider.GetRequiredService(p) as IEmailTemplateDefinitionProvider)
+                    .ToList();
+
+                foreach (var provider in providers)
+                {
+                    provider.Define(new EmailTemplateDefinitionContext(templates));
+                }
+            }
+
+            return templates;
+        }
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionProvider.cs

@@ -0,0 +1,9 @@
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public abstract class EmailTemplateDefinitionProvider : IEmailTemplateDefinitionProvider, ITransientDependency
+    {
+        public abstract void Define(IEmailTemplateDefinitionContext context);
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateInitializationContext.cs

@@ -0,0 +1,18 @@
+using System;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public class EmailTemplateInitializationContext
+    {
+        public EmailTemplateDefinition EmailTemplateDefinition { get; }
+
+        public IServiceProvider ServiceProvider { get; }
+
+        public EmailTemplateInitializationContext(EmailTemplateDefinition emailTemplateDefinition,
+            IServiceProvider serviceProvider)
+        {
+            EmailTemplateDefinition = emailTemplateDefinition;
+            ServiceProvider = serviceProvider;
+        }
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateOptions.cs

@@ -1,26 +1,18 @@
-using System.Collections.Generic;
+using Volo.Abp.Collections;
-using Volo.Abp.Emailing.Templates.Virtual;
 
 namespace Volo.Abp.Emailing.Templates
 {
     public class EmailTemplateOptions
     {
-        public List<IEmailTemplateProviderContributor> Providers { get; }
-
-        public EmailTemplateDefinitionDictionary Templates { get; }
-
         public string DefaultLayout { get; set; }
 
+        public ITypeList<IEmailTemplateDefinitionProvider> DefinitionProviders { get; }
+
         public EmailTemplateOptions()
         {
-            Providers = new List<IEmailTemplateProviderContributor>
-            {
-                new VirtualFileEmailTemplateProviderContributor()
-            };
-
-            Templates = new EmailTemplateDefinitionDictionary();
-
             DefaultLayout = StandardEmailTemplates.DefaultLayout;
+
+            DefinitionProviders = new TypeList<IEmailTemplateDefinitionProvider>();
         }
     }
 }

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateProvider.cs

@@ -1,6 +1,6 @@
 using System;
+using System.Globalization;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
@@ -10,80 +10,105 @@ namespace Volo.Abp.Emailing.Templates
 {
     public class EmailTemplateProvider : IEmailTemplateProvider, ITransientDependency
     {
-        protected IServiceProvider ServiceProvider { get; }
+        protected IEmailTemplateDefinitionManager EmailTemplateDefinitionManager;
         protected ITemplateLocalizer TemplateLocalizer { get; }
         protected EmailTemplateOptions Options { get; }
+        protected IStringLocalizerFactory StringLocalizerFactory;
 
-        public EmailTemplateProvider(
+        public EmailTemplateProvider(IEmailTemplateDefinitionManager emailTemplateDefinitionManager,
-            IOptions<EmailTemplateOptions> options, 
+            ITemplateLocalizer templateLocalizer, IStringLocalizerFactory stringLocalizerFactory,
-            IServiceProvider serviceProvider,
+            IOptions<EmailTemplateOptions> options)
-            ITemplateLocalizer templateLocalizer)
         {
-            ServiceProvider = serviceProvider;
+            EmailTemplateDefinitionManager = emailTemplateDefinitionManager;
             TemplateLocalizer = templateLocalizer;
+            StringLocalizerFactory = stringLocalizerFactory;
             Options = options.Value;
         }
 
-        public async Task<EmailTemplate> GetAsync(string name)
+        public async Task<EmailTemplate> GetAsync(string name, string cultureName)
         {
-            using (var scope = ServiceProvider.CreateScope())
+            return await GetInternalAsync(name, cultureName);
-            {
-                return await GetInternalAsync(scope.ServiceProvider, name);
-            }
         }
 
-        protected virtual async Task<EmailTemplate> GetInternalAsync(IServiceProvider serviceProvider, string name)
+        protected virtual async Task<EmailTemplate> GetInternalAsync(string name, string cultureName)
         {
-            var context = new EmailTemplateProviderContributorContext(name, serviceProvider);
+            var emailTemplateDefinition = EmailTemplateDefinitionManager.GetOrNull(name);
+            if (emailTemplateDefinition == null)
+            {
+                // TODO: Localized message
+                throw new AbpException($"email template {name} not definition");
+            }
 
-            foreach (var provider in Options.Providers)
+            var emailTemplateString = emailTemplateDefinition.Contributors.GetOrNull(cultureName);
+            if (emailTemplateString == null && emailTemplateDefinition.DefaultCultureName != null)
             {
-                await provider.ProvideAsync(context);
+                emailTemplateString =
+                    emailTemplateDefinition.Contributors.GetOrNull(emailTemplateDefinition.DefaultCultureName);
+                if (emailTemplateString != null)
+                {
+                    cultureName = emailTemplateDefinition.DefaultCultureName;
+                }
             }
 
-            if (context.Template == null)
+            if (emailTemplateString != null)
             {
-                throw new AbpException($"Could not found the template: {name}");
+                var emailTemplate = new EmailTemplate(emailTemplateString, emailTemplateDefinition);
+
+                await SetLayoutAsync(emailTemplateDefinition, emailTemplate, cultureName);
+
+                if (emailTemplateDefinition.SingleTemplateFile)
+                {
+                    await LocalizeAsync(emailTemplateDefinition, emailTemplate, cultureName);
+                }
+
+                return emailTemplate;
             }
 
-            await SetLayoutAsync(serviceProvider, context);
+            // TODO: Localized message
-            await LocalizeAsync(serviceProvider, context);
+            throw new AbpException($"{cultureName} template not exist!");
-            
-            return context.Template;
         }
 
-        protected virtual async Task SetLayoutAsync(IServiceProvider serviceProvider, EmailTemplateProviderContributorContext context)
+        protected virtual async Task SetLayoutAsync(EmailTemplateDefinition emailTemplateDefinition,
+            EmailTemplate emailTemplate, string cultureName)
         {
-            var layout = context.Template.Definition.Layout;
+            var layout = emailTemplateDefinition.Layout;
-
+            if (layout.IsNullOrWhiteSpace())
-            if (layout.IsNullOrEmpty())
             {
                 return;
             }
-            
+
             if (layout == EmailTemplateDefinition.DefaultLayoutPlaceHolder)
             {
                 layout = Options.DefaultLayout;
             }
 
-            var layoutTemplate = await GetInternalAsync(serviceProvider, layout);
+            var layoutTemplate = await GetInternalAsync(layout, cultureName);
-            context.Template.SetLayout(layoutTemplate);
+
+            emailTemplate.SetLayout(layoutTemplate);
         }
 
-        protected virtual Task LocalizeAsync(IServiceProvider serviceProvider, EmailTemplateProviderContributorContext context)
+        protected virtual Task LocalizeAsync(EmailTemplateDefinition emailTemplateDefinition,
+            EmailTemplate emailTemplate, string cultureName)
         {
-            if (context.Template.Definition.LocalizationResource == null)
+            if (emailTemplateDefinition.LocalizationResource == null)
             {
                 return Task.CompletedTask;
             }
 
-            var localizer = serviceProvider
+            var localizer = StringLocalizerFactory.Create(emailTemplateDefinition.LocalizationResource);
-                .GetRequiredService<IStringLocalizerFactory>()
+            if (cultureName != null)
-                .Create(context.Template.Definition.LocalizationResource);
+            {
-
+                emailTemplate.SetContent(
-            context.Template.SetContent(
+                    TemplateLocalizer.Localize(localizer.WithCulture(new CultureInfo(cultureName)),
-                TemplateLocalizer.Localize(localizer, context.Template.Content)
+                        emailTemplate.Content)
-            );
+                );
+            }
+            else
+            {
+                emailTemplate.SetContent(
+                    TemplateLocalizer.Localize(localizer, emailTemplate.Content)
+                );
+            }
 
             return Task.CompletedTask;
         }

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateProviderContributorContext.cs

@@ -1,20 +0,0 @@
-using System;
-using Volo.Abp.DependencyInjection;
-
-namespace Volo.Abp.Emailing.Templates
-{
-    public class EmailTemplateProviderContributorContext : IServiceProviderAccessor
-    {
-        public string Name { get; }
-
-        public IServiceProvider ServiceProvider { get; }
-
-        public EmailTemplate Template { get; set; }
-
-        public EmailTemplateProviderContributorContext(string name, IServiceProvider serviceProvider)
-        {
-            Name = name;
-            ServiceProvider = serviceProvider;
-        }
-    }
-}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateContributor.cs

@@ -0,0 +1,9 @@
+namespace Volo.Abp.Emailing.Templates
+{
+    public interface IEmailTemplateContributor
+    {
+        void Initialize(EmailTemplateInitializationContext context);
+
+        string GetOrNull(string cultureName);
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionContext.cs

@@ -0,0 +1,9 @@
+namespace Volo.Abp.Emailing.Templates
+{
+    public interface IEmailTemplateDefinitionContext
+    {
+        EmailTemplateDefinition GetOrNull(string name);
+
+        void Add(params EmailTemplateDefinition[] definitions);
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionManager.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public interface IEmailTemplateDefinitionManager
+    {
+        [NotNull]
+        EmailTemplateDefinition Get([NotNull] string name);
+
+        IReadOnlyList<EmailTemplateDefinition> GetAll();
+
+        EmailTemplateDefinition GetOrNull(string name);
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionProvider.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.Emailing.Templates
+{
+    public interface IEmailTemplateDefinitionProvider
+    {
+        void Define(IEmailTemplateDefinitionContext context);
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateProvider.cs

@@ -4,6 +4,6 @@ namespace Volo.Abp.Emailing.Templates
 {
     public interface IEmailTemplateProvider
     {
-        Task<EmailTemplate> GetAsync(string name);
+        Task<EmailTemplate> GetAsync(string name, string cultureName);
     }
-}
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateProviderContributor.cs

@@ -1,9 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Volo.Abp.Emailing.Templates
-{
-    public interface IEmailTemplateProviderContributor
-    {
-        Task ProvideAsync(EmailTemplateProviderContributorContext contributorContext);
-    }
-}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/ITemplateRender.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public interface ITemplateRender
+    {
+        Task<string> RenderAsync(string template, object model = null);
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/TemplateRender.cs

@@ -0,0 +1,15 @@
+using System.Threading.Tasks;
+using Scriban;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public class TemplateRender : ITemplateRender, ITransientDependency
+    {
+        public async Task<string> RenderAsync(string template, object model = null)
+        {
+            var scribanTemplate = Template.Parse(template);
+            return await scribanTemplate.RenderAsync(model);
+        }
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Virtual/EmailTemplateDefinitionExtensions.cs

@@ -1,16 +0,0 @@
-namespace Volo.Abp.Emailing.Templates.Virtual
-{
-    public static class EmailTemplateDefinitionExtensions
-    {
-        public static EmailTemplateDefinition SetVirtualFilePath(this EmailTemplateDefinition emailTemplateDefinition, string path)
-        {
-            emailTemplateDefinition[VirtualFileEmailTemplateProviderContributor.VirtualFilePathKey] = path;
-            return emailTemplateDefinition;
-        }
-
-        public static string GetVirtualFilePathOrNull(this EmailTemplateDefinition emailTemplateDefinition)
-        {
-            return emailTemplateDefinition[VirtualFileEmailTemplateProviderContributor.VirtualFilePathKey] as string;
-        }
-    }
-}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Virtual/VirtualFileEmailTemplateOptions.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-
-namespace Volo.Abp.Emailing.Templates.Virtual
-{
-    public class VirtualFileEmailTemplateOptions
-    {
-        public IDictionary<string, string> Templates { get; }
-
-        public VirtualFileEmailTemplateOptions()
-        {
-            Templates = new Dictionary<string, string>();
-        }
-    }
-}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Virtual/VirtualFileEmailTemplateProviderContributor.cs

@@ -1,61 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.FileProviders;
-using Microsoft.Extensions.Options;
-using Volo.Abp.VirtualFileSystem;
-
-namespace Volo.Abp.Emailing.Templates.Virtual
-{
-    public class VirtualFileEmailTemplateProviderContributor : IEmailTemplateProviderContributor
-    {
-        public const string VirtualFilePathKey = "VirtualFilePath";
-
-        public Task ProvideAsync(EmailTemplateProviderContributorContext contributorContext)
-        {
-            var templateDefinition = FindTemplateDefinition(contributorContext);
-            if (templateDefinition == null)
-            {
-                return Task.CompletedTask;
-            }
-
-            var fileInfo = FindVirtualFileInfo(contributorContext, templateDefinition);
-            if (fileInfo == null)
-            {
-                return Task.CompletedTask;
-            }
-
-            contributorContext.Template = new EmailTemplate(fileInfo.ReadAsString(), templateDefinition);
-            return Task.CompletedTask;
-        }
-
-        protected virtual EmailTemplateDefinition FindTemplateDefinition(EmailTemplateProviderContributorContext contributorContext)
-        {
-            return contributorContext
-                .ServiceProvider
-                .GetRequiredService<IOptions<EmailTemplateOptions>>()
-                .Value
-                .Templates
-                .GetOrDefault(contributorContext.Name);
-        }
-
-        protected virtual IFileInfo FindVirtualFileInfo(EmailTemplateProviderContributorContext contributorContext, EmailTemplateDefinition templateDefinition)
-        {
-            var virtualFilePath = templateDefinition?.GetVirtualFilePathOrNull();
-            if (virtualFilePath == null)
-            {
-                return null;
-            }
-
-            var virtualFileProvider = contributorContext.ServiceProvider.GetRequiredService<IVirtualFileProvider>();
-
-            var fileInfo = virtualFileProvider.GetFileInfo(virtualFilePath);
-            if (fileInfo?.Exists != true)
-            {
-                return null;
-            }
-
-            return fileInfo;
-        }
-    }
-}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/VirtualFiles/EmailTemplateDefinitionExtensions.cs

@@ -0,0 +1,19 @@
+namespace Volo.Abp.Emailing.Templates.VirtualFiles
+{
+    public static class EmailTemplateDefinitionExtensions
+    {
+        public static EmailTemplateDefinition AddTemplateVirtualFile(
+            this EmailTemplateDefinition emailTemplateDefinition, string path)
+        {
+            emailTemplateDefinition.Contributors.Add(new SingleVirtualFileEmailTemplateContributor(path));
+            return emailTemplateDefinition;
+        }
+
+        public static EmailTemplateDefinition AddTemplateVirtualFiles(
+            this EmailTemplateDefinition emailTemplateDefinition, string path)
+        {
+            emailTemplateDefinition.Contributors.Add(new MultipleVirtualFilesEmailTemplateContributor(path));
+            return emailTemplateDefinition;
+        }
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/VirtualFiles/MultipleVirtualFilesEmailTemplateContributor.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+using Volo.Abp.VirtualFileSystem;
+
+namespace Volo.Abp.Emailing.Templates.VirtualFiles
+{
+    public class MultipleVirtualFilesEmailTemplateContributor : IEmailTemplateContributor
+    {
+        private readonly string _virtualPath;
+
+        private IVirtualFileProvider _virtualFileProvider;
+
+        private Dictionary<string, string> _templateDictionary;
+
+        private readonly object _syncObj = new object();
+
+        public MultipleVirtualFilesEmailTemplateContributor(string virtualPath)
+        {
+            _virtualPath = virtualPath;
+        }
+
+        public void Initialize(EmailTemplateInitializationContext context)
+        {
+            _virtualFileProvider = context.ServiceProvider.GetRequiredService<IVirtualFileProvider>();
+        }
+
+        public string GetOrNull(string cultureName)
+        {
+            return GetTemplateDictionary().GetOrDefault(cultureName);
+        }
+
+        private Dictionary<string, string> GetTemplateDictionary()
+        {
+            var dictionaries = _templateDictionary;
+            if (dictionaries != null)
+            {
+                return dictionaries;
+            }
+
+            lock (_syncObj)
+            {
+                dictionaries = _templateDictionary;
+                if (dictionaries != null)
+                {
+                    return dictionaries;
+                }
+
+                _templateDictionary = new Dictionary<string, string>();
+                foreach (var file in _virtualFileProvider.GetDirectoryContents(_virtualPath))
+                {
+                    if (file.IsDirectory)
+                    {
+                        continue;
+                    }
+
+                    // TODO: How to normalize file names?
+                    _templateDictionary.Add(file.Name.RemovePostFix(".tpl"), file.ReadAsString());
+                }
+
+                dictionaries = _templateDictionary;
+            }
+
+            return dictionaries;
+        }
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/VirtualFiles/SingleVirtualFileEmailTemplateContributor.cs

@@ -0,0 +1,34 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+using Volo.Abp.VirtualFileSystem;
+
+namespace Volo.Abp.Emailing.Templates.VirtualFiles
+{
+    public class SingleVirtualFileEmailTemplateContributor : IEmailTemplateContributor
+    {
+        private readonly string _virtualPath;
+
+        private IVirtualFileProvider _virtualFileProvider;
+
+        public SingleVirtualFileEmailTemplateContributor(string virtualPath)
+        {
+            _virtualPath = virtualPath;
+        }
+
+        public void Initialize(EmailTemplateInitializationContext context)
+        {
+            _virtualFileProvider = context.ServiceProvider.GetRequiredService<IVirtualFileProvider>();
+        }
+
+        public string GetOrNull(string cultureName)
+        {
+            var file = _virtualFileProvider.GetFileInfo(_virtualPath);
+            if (file == null || !file.Exists || file.IsDirectory)
+            {
+                return null;
+            }
+
+            return file.ReadAsString();
+        }
+    }
+}

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/IMemoryDatabase.cs

@@ -1,10 +1,10 @@
-using System.Collections.Generic;
+using Volo.Abp.Domain.Entities;
 
 namespace Volo.Abp.Domain.Repositories.MemoryDb
 {
     public interface IMemoryDatabase
     {
-        List<TEntity> Collection<TEntity>();
+        IMemoryDatabaseCollection<TEntity> Collection<TEntity>() where TEntity : class, IEntity;
 
         TKey GenerateNextId<TEntity, TKey>();
     }

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/IMemoryDatabaseCollection.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Domain.Repositories.MemoryDb
+{
+    public interface IMemoryDatabaseCollection<TEntity> : IEnumerable<TEntity>
+    {
+        void Add(TEntity entity);
+
+        void Update(TEntity entity);
+
+        void Remove(TEntity entity);
+    }
+}

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/IMemoryDbRepository.cs

@@ -8,7 +8,7 @@ namespace Volo.Abp.Domain.Repositories.MemoryDb
     {
         IMemoryDatabase Database { get; }
 
-        List<TEntity> Collection { get; }
+        IMemoryDatabaseCollection<TEntity> Collection { get; }
     }
 
     public interface IMemoryDbRepository<TEntity, TKey> : IMemoryDbRepository<TEntity>, IRepository<TEntity, TKey>

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/IMemoryDbSerializer.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Volo.Abp.Domain.Repositories.MemoryDb
+{
+    public interface IMemoryDbSerializer
+    {
+        byte[] Serialize(object obj);
+
+        object Deserialize(byte[] value, Type type);
+    }
+}

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDatabase.cs

@@ -1,24 +1,33 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities;
 
 namespace Volo.Abp.Domain.Repositories.MemoryDb
 {
-    public class MemoryDatabase : IMemoryDatabase
+    public class MemoryDatabase : IMemoryDatabase, ITransientDependency
     {
         private readonly ConcurrentDictionary<Type, object> _sets;
 
         private readonly ConcurrentDictionary<Type, InMemoryIdGenerator> _entityIdGenerators;
 
-        public MemoryDatabase()
+        private readonly IServiceProvider _serviceProvider;
+
+        public MemoryDatabase(IServiceProvider serviceProvider)
         {
+            _serviceProvider = serviceProvider;
             _sets = new ConcurrentDictionary<Type, object>();
             _entityIdGenerators = new ConcurrentDictionary<Type, InMemoryIdGenerator>();
         }
 
-        public List<TEntity> Collection<TEntity>()
+        public IMemoryDatabaseCollection<TEntity> Collection<TEntity>()
+            where TEntity : class, IEntity
         {
-            return _sets.GetOrAdd(typeof(TEntity), _ => new List<TEntity>()) as List<TEntity>;
+            return _sets.GetOrAdd(typeof(TEntity),
+                    _ => _serviceProvider.GetRequiredService<IMemoryDatabaseCollection<TEntity>>()) as
+                IMemoryDatabaseCollection<TEntity>;
         }
 
         public TKey GenerateNextId<TEntity, TKey>()

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDatabaseCollection.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Volo.Abp.Domain.Entities;
+
+namespace Volo.Abp.Domain.Repositories.MemoryDb
+{
+    public class MemoryDatabaseCollection<TEntity> : IMemoryDatabaseCollection<TEntity>
+        where TEntity : class, IEntity
+    {
+        private readonly Dictionary<string, byte[]> _dictionary = new Dictionary<string, byte[]>();
+
+        private readonly IMemoryDbSerializer _memoryDbSerializer;
+
+        public MemoryDatabaseCollection(IMemoryDbSerializer memoryDbSerializer)
+        {
+            _memoryDbSerializer = memoryDbSerializer;
+        }
+
+        public IEnumerator<TEntity> GetEnumerator()
+        {
+            foreach (var entity in _dictionary.Values)
+            {
+                yield return _memoryDbSerializer.Deserialize(entity, typeof(TEntity)).As<TEntity>();
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public void Add(TEntity entity)
+        {
+            _dictionary.Add(GetEntityKey(entity), _memoryDbSerializer.Serialize(entity));
+        }
+
+        public void Update(TEntity entity)
+        {
+            if (_dictionary.ContainsKey(GetEntityKey(entity)))
+            {
+                _dictionary[GetEntityKey(entity)] = _memoryDbSerializer.Serialize(entity);
+            }
+        }
+
+        public void Remove(TEntity entity)
+        {
+            _dictionary.Remove(GetEntityKey(entity));
+        }
+
+        private string GetEntityKey(TEntity entity)
+        {
+            return entity.GetKeys().JoinAsString(",");
+        }
+    }
+}

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDatabaseManager.cs

@@ -1,19 +1,25 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Domain.Repositories.MemoryDb
 {
-    public static class MemoryDatabaseManager
+    public class MemoryDatabaseManager : ISingletonDependency
     {
-        private static ConcurrentDictionary<string, IMemoryDatabase> _databases;
+        private readonly ConcurrentDictionary<string, IMemoryDatabase> _databases =
+            new ConcurrentDictionary<string, IMemoryDatabase>();
 
-        static MemoryDatabaseManager()
+        private readonly IServiceProvider _serviceProvider;
+
+        public MemoryDatabaseManager(IServiceProvider serviceProvider)
         {
-            _databases = new ConcurrentDictionary<string, IMemoryDatabase>();
+            _serviceProvider = serviceProvider;
         }
 
-        public static IMemoryDatabase Get(string databaseName)
+        public IMemoryDatabase Get(string databaseName)
         {
-            return _databases.GetOrAdd(databaseName, _ => new MemoryDatabase());
+            return _databases.GetOrAdd(databaseName, _ => _serviceProvider.GetRequiredService<IMemoryDatabase>());
         }
     }
 }

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs

@@ -14,7 +14,7 @@ namespace Volo.Abp.Domain.Repositories.MemoryDb
     {
         //TODO: Add dbcontext just like mongodb implementation!
 
-        public virtual List<TEntity> Collection => Database.Collection<TEntity>();
+        public virtual IMemoryDatabaseCollection<TEntity> Collection => Database.Collection<TEntity>();
 
         public virtual IMemoryDatabase Database => DatabaseProvider.GetDatabase();
 
@@ -33,6 +33,7 @@ namespace Volo.Abp.Domain.Repositories.MemoryDb
 
         public override TEntity Update(TEntity entity, bool autoSave = false)
         {
+            Collection.Update(entity);
             return entity;
         }
 
@@ -48,7 +49,7 @@ namespace Volo.Abp.Domain.Repositories.MemoryDb
 
         public override long GetCount()
         {
-            return Collection.Count;
+            return Collection.Count();
         }
 
         protected override IQueryable<TEntity> GetQueryable()

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/Utf8JsonMemoryDbSerializer.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Text;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Json;
+
+namespace Volo.Abp.Domain.Repositories.MemoryDb
+{
+    public class Utf8JsonMemoryDbSerializer : IMemoryDbSerializer, ITransientDependency
+    {
+        private readonly IJsonSerializer _jsonSerializer;
+
+        public Utf8JsonMemoryDbSerializer(IJsonSerializer jsonSerializer)
+        {
+            _jsonSerializer = jsonSerializer;
+        }
+
+        byte[] IMemoryDbSerializer.Serialize(object obj)
+        {
+            return Encoding.UTF8.GetBytes(_jsonSerializer.Serialize(obj));
+        }
+
+        public object Deserialize(byte[] value, Type type)
+        {
+            return _jsonSerializer.Deserialize(type, Encoding.UTF8.GetString(value));
+        }
+    }
+}

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDbCoreRepositoryExtensions.cs

@@ -13,7 +13,7 @@ namespace Volo.Abp.Domain.Repositories
             return repository.ToMemoryDbRepository().Database;
         }
 
-        public static List<TEntity> GetCollection<TEntity, TKey>(this IBasicRepository<TEntity, TKey> repository)
+        public static IMemoryDatabaseCollection<TEntity> GetCollection<TEntity, TKey>(this IBasicRepository<TEntity, TKey> repository)
             where TEntity : class, IEntity<TKey>
         {
             return repository.ToMemoryDbRepository().Collection;

framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/AbpMemoryDbModule.cs

@@ -1,19 +1,19 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Volo.Abp.Domain;
+using Volo.Abp.Domain.Repositories.MemoryDb;
+using Volo.Abp.Json;
 using Volo.Abp.Modularity;
 using Volo.Abp.Uow.MemoryDb;
 
 namespace Volo.Abp.MemoryDb
 {
-    /* TODO: Consider to store objects as binary serialized in the memory, which makes unit tests more realistic.
-     */
-
     [DependsOn(typeof(AbpDddDomainModule))]
     public class AbpMemoryDbModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.TryAddTransient(typeof(IMemoryDatabaseProvider<>), typeof(UnitOfWorkMemoryDatabaseProvider<>));
+            context.Services.TryAddTransient(typeof(IMemoryDatabaseCollection<>), typeof(MemoryDatabaseCollection<>));
         }
     }
 }

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Uow/MemoryDb/UnitOfWorkMemoryDatabaseProvider.cs

@@ -11,15 +11,18 @@ namespace Volo.Abp.Uow.MemoryDb
         
         private readonly IUnitOfWorkManager _unitOfWorkManager;
         private readonly IConnectionStringResolver _connectionStringResolver;
+        private readonly MemoryDatabaseManager _memoryDatabaseManager;
 
         public UnitOfWorkMemoryDatabaseProvider(
             IUnitOfWorkManager unitOfWorkManager,
             IConnectionStringResolver connectionStringResolver,
-            TMemoryDbContext dbContext)
+            TMemoryDbContext dbContext, 
+            MemoryDatabaseManager memoryDatabaseManager)
         {
             _unitOfWorkManager = unitOfWorkManager;
             _connectionStringResolver = connectionStringResolver;
             DbContext = dbContext;
+            _memoryDatabaseManager = memoryDatabaseManager;
         }
 
         public IMemoryDatabase GetDatabase()
@@ -36,7 +39,7 @@ namespace Volo.Abp.Uow.MemoryDb
             var databaseApi = unitOfWork.GetOrAddDatabaseApi(
                 dbContextKey,
                 () => new MemoryDbDatabaseApi(
-                    MemoryDatabaseManager.Get(connectionString)
+                    _memoryDatabaseManager.Get(connectionString)
                 ));
 
             return ((MemoryDbDatabaseApi)databaseApi).Database;

framework/src/Volo.Abp.Timing/Volo/Abp/Timing/DisableDateTimeNormalizationAttribute.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Volo.Abp.Timing
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property | AttributeTargets.Parameter)]
+    public class DisableDateTimeNormalizationAttribute : Attribute
+    {
+
+    }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs

@@ -16,26 +16,34 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning
         )]
     public class AbpAspNetCoreMvcVersioningTestModule : AbpModule
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
+        public override void PreConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<AbpAspNetCoreMvcOptions>(options =>
+            PreConfigure<AbpAspNetCoreMvcOptions>(options =>
             {
                 //2.0 Version
                 options.ConventionalControllers.Create(typeof(AbpAspNetCoreMvcVersioningTestModule).Assembly, opts =>
                 {
-                    opts.TypePredicate = t => t.Namespace == typeof(Volo.Abp.AspNetCore.Mvc.Versioning.App.TodoAppService).Namespace;
+                    opts.TypePredicate = t => t.Namespace == typeof(Volo.Abp.AspNetCore.Mvc.Versioning.App.v2.TodoAppService).Namespace;
                     opts.ApiVersions.Add(new ApiVersion(2, 0));
                 });
 
                 //1.0 Compatibility version
                 options.ConventionalControllers.Create(typeof(AbpAspNetCoreMvcVersioningTestModule).Assembly, opts =>
                 {
-                    opts.TypePredicate = t => t.Namespace == typeof(Volo.Abp.AspNetCore.Mvc.Versioning.App.Compat.TodoAppService).Namespace;
+                    opts.TypePredicate = t => t.Namespace == typeof(Volo.Abp.AspNetCore.Mvc.Versioning.App.v1.TodoAppService).Namespace;
                     opts.ApiVersions.Add(new ApiVersion(1, 0));
                 });
             });
+        }
+
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpAspNetCoreMvcOptions>(options =>
+            {
+                context.Services.ExecutePreConfiguredActions(options);
+            });
 
-            context.Services.AddApiVersioning(options =>
+            context.Services.AddAbpApiVersioning(options =>
             {
                 options.ReportApiVersions = true;
                 options.AssumeDefaultVersionWhenUnspecified = true;
@@ -43,7 +51,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning
                 //options.ApiVersionReader = new HeaderApiVersionReader("api-version"); //Supports header too
                 //options.ApiVersionReader = new MediaTypeApiVersionReader(); //Supports accept header too
 
-                options.ConfigureAbp(context.Services);
+                var mvcOptions = context.Services.ExecutePreConfiguredActions<AbpAspNetCoreMvcOptions>();
+                options.ConfigureAbp(mvcOptions);
             });
 
             context.Services.AddHttpClientProxies(typeof(AbpAspNetCoreMvcVersioningTestModule).Assembly);

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/Compat/ITodoAppService.cs

@@ -1,9 +0,0 @@
-using Volo.Abp.Application.Services;
-
-namespace Volo.Abp.AspNetCore.Mvc.Versioning.App.Compat
-{
-    public interface ITodoAppService : IApplicationService
-    {
-        string Get(int id);
-    }
-}

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/Compat/TodoAppService.cs

@@ -1,25 +0,0 @@
-using Volo.Abp.ApiVersioning;
-using Volo.Abp.Application.Services;
-
-namespace Volo.Abp.AspNetCore.Mvc.Versioning.App.Compat
-{
-    public class TodoAppService : ApplicationService, ITodoAppService
-    {
-        private readonly IRequestedApiVersion _requestedApiVersion;
-
-        public TodoAppService(IRequestedApiVersion requestedApiVersion)
-        {
-            _requestedApiVersion = requestedApiVersion;
-        }
-
-        public string Get(int id)
-        {
-            return "Compat-" + id + "-" + GetVersionOrNone();
-        }
-
-        private string GetVersionOrNone()
-        {
-            return _requestedApiVersion.Current ?? "NONE";
-        }
-    }
-}

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/HelloController.cs

@@ -5,13 +5,33 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning.App
 {
     [ApiVersion("1.0")]
     [ApiVersion("2.0")]
+    [ApiController]
     [Route("api/v{apiVersion:apiVersion}/[controller]")]
     public class HelloController : AbpController, IHelloController
     {
+        [HttpGet]
+        public Task<string> GetAsync()
+        {
+            return Task.FromResult($"Get-{HttpContext.GetRequestedApiVersion().ToString()}");
+        }
+
+        [HttpPost]
+        [MapToApiVersion("1.0")]
+        public Task<string> PostAsyncV1()
+        {
+            return PostAsync();
+        }
+
         [HttpPost]
-        public Task<string> PostAsync()
+        [MapToApiVersion("2.0")]
+        public Task<string> PostAsyncV2()
+        {
+            return PostAsync();
+        }
+
+        private Task<string> PostAsync()
         {
-            return Task.FromResult($"42-{HttpContext.GetRequestedApiVersion().ToString()}");
+            return Task.FromResult($"Post-{HttpContext.GetRequestedApiVersion().ToString()}");
         }
     }
 }

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/IHelloController.cs

@@ -4,6 +4,10 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning.App
 {
     public interface IHelloController : IRemoteService
     {
-        Task<string> PostAsync();
+        Task<string> GetAsync();
+
+        Task<string> PostAsyncV1();
+
+        Task<string> PostAsyncV2();
     }
 }

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/ITodoAppService.cs

@@ -1,9 +0,0 @@
-using Volo.Abp.Application.Services;
-
-namespace Volo.Abp.AspNetCore.Mvc.Versioning.App
-{
-    public interface ITodoAppService : IApplicationService
-    {
-        string Get(int id);
-    }
-}

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/TodoAppService.cs

@@ -1,25 +0,0 @@
-using Volo.Abp.ApiVersioning;
-using Volo.Abp.Application.Services;
-
-namespace Volo.Abp.AspNetCore.Mvc.Versioning.App
-{
-    public class TodoAppService : ApplicationService, ITodoAppService
-    {
-        private readonly IRequestedApiVersion _requestedApiVersion;
-
-        public TodoAppService(IRequestedApiVersion requestedApiVersion)
-        {
-            _requestedApiVersion = requestedApiVersion;
-        }
-
-        public string Get(int id)
-        {
-            return id + "-" + GetVersionOrNone();
-        }
-
-        private string GetVersionOrNone()
-        {
-            return _requestedApiVersion.Current ?? "NONE";
-        }
-    }
-}

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/v1/ITodoAppService.cs

@@ -0,0 +1,9 @@
+using Volo.Abp.Application.Services;
+
+namespace Volo.Abp.AspNetCore.Mvc.Versioning.App.v1
+{
+    public interface ITodoAppService : IApplicationService
+    {
+        string Get(int id);
+    }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/v1/TodoAppService.cs

@@ -0,0 +1,25 @@
+using Volo.Abp.ApiVersioning;
+using Volo.Abp.Application.Services;
+
+namespace Volo.Abp.AspNetCore.Mvc.Versioning.App.v1
+{
+    public class TodoAppService : ApplicationService, ITodoAppService
+    {
+        private readonly IRequestedApiVersion _requestedApiVersion;
+
+        public TodoAppService(IRequestedApiVersion requestedApiVersion)
+        {
+            _requestedApiVersion = requestedApiVersion;
+        }
+
+        public string Get(int id)
+        {
+            return $"Compat-{id}-{GetVersionOrNone()}";
+        }
+
+        private string GetVersionOrNone()
+        {
+            return _requestedApiVersion.Current ?? "NONE";
+        }
+    }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/v2/ITodoAppService.cs

@@ -0,0 +1,9 @@
+using Volo.Abp.Application.Services;
+
+namespace Volo.Abp.AspNetCore.Mvc.Versioning.App.v2
+{
+    public interface ITodoAppService : IApplicationService
+    {
+        string Get(int id);
+    }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/v2/TodoAppService.cs

@@ -0,0 +1,25 @@
+using Volo.Abp.ApiVersioning;
+using Volo.Abp.Application.Services;
+
+namespace Volo.Abp.AspNetCore.Mvc.Versioning.App.v2
+{
+    public class TodoAppService : ApplicationService, ITodoAppService
+    {
+        private readonly IRequestedApiVersion _requestedApiVersion;
+
+        public TodoAppService(IRequestedApiVersion requestedApiVersion)
+        {
+            _requestedApiVersion = requestedApiVersion;
+        }
+
+        public string Get(int id)
+        {
+            return id + "-" + GetVersionOrNone();
+        }
+
+        private string GetVersionOrNone()
+        {
+            return _requestedApiVersion.Current ?? "NONE";
+        }
+    }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Test/Compat/TodoAppService_Tests.cs

@@ -1,23 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Shouldly;
-using Volo.Abp.AspNetCore.Mvc.Versioning.App.Compat;
-using Xunit;
-
-namespace Volo.Abp.AspNetCore.Mvc.Versioning.Test.Compat
-{
-    public class TodoAppService_Tests : AspNetCoreMvcVersioningTestBase
-    {
-        private readonly ITodoAppService _todoAppService;
-
-        public TodoAppService_Tests()
-        {
-            _todoAppService = ServiceProvider.GetRequiredService<ITodoAppService>();
-        }
-
-        [Fact(Skip = "It stopped working after ASP.NET Core 2.2 Upgrade. Should work on that.")]
-        public void Get()
-        {
-            _todoAppService.Get(42).ShouldBe("Compat-42-1.0");
-        }
-    }
-}

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Test/HelloController_Tests.cs

@@ -8,17 +8,29 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning.Test
 {
     public class HelloController_Tests: AspNetCoreMvcVersioningTestBase
     {
-        private readonly IHelloController _todoAppService;
+        private readonly IHelloController _helloController;
 
         public HelloController_Tests()
         {
-            _todoAppService = ServiceProvider.GetRequiredService<IHelloController>();
+            _helloController = ServiceProvider.GetRequiredService<IHelloController>();
         }
 
         [Fact]
-        public async Task PostAsync()
+        public async Task GetAsync()
         {
-            (await _todoAppService.PostAsync()).ShouldBe("42-2.0");
+            (await _helloController.GetAsync()).ShouldBe("Get-2.0");
+        }
+
+        [Fact]
+        public async Task PostAsyncV1()
+        {
+            (await _helloController.PostAsyncV1()).ShouldBe("Post-1.0");
+        }
+
+        [Fact]
+        public async Task PostAsyncV2()
+        {
+            (await _helloController.PostAsyncV2()).ShouldBe("Post-2.0");
         }
     }
 }

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Test/TodoAppService_Tests.cs

@@ -1,23 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Shouldly;
-using Volo.Abp.AspNetCore.Mvc.Versioning.App;
-using Xunit;
-
-namespace Volo.Abp.AspNetCore.Mvc.Versioning.Test
-{
-    public class TodoAppService_Tests : AspNetCoreMvcVersioningTestBase
-    {
-        private readonly ITodoAppService _todoAppService;
-
-        public TodoAppService_Tests()
-        {
-            _todoAppService = ServiceProvider.GetRequiredService<ITodoAppService>();
-        }
-
-        [Fact(Skip = "It stopped working after ASP.NET Core 2.2 Upgrade. Should work on that.")]
-        public void Get()
-        {
-            _todoAppService.Get(42).ShouldBe("42-2.0");
-        }
-    }
-}

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Test/v1/TodoAppService_Tests.cs

@@ -0,0 +1,23 @@
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Volo.Abp.AspNetCore.Mvc.Versioning.App.v1;
+using Xunit;
+
+namespace Volo.Abp.AspNetCore.Mvc.Versioning.Test.v1
+{
+    public class TodoAppService_Tests : AspNetCoreMvcVersioningTestBase
+    {
+        private readonly ITodoAppService _todoAppService;
+
+        public TodoAppService_Tests()
+        {
+            _todoAppService = ServiceProvider.GetRequiredService<ITodoAppService>();
+        }
+
+        [Fact]
+        public void Get()
+        {
+            _todoAppService.Get(42).ShouldBe("Compat-42-1.0");
+        }
+    }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Test/v2/TodoAppService_Tests.cs

@@ -0,0 +1,23 @@
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Volo.Abp.AspNetCore.Mvc.Versioning.App.v2;
+using Xunit;
+
+namespace Volo.Abp.AspNetCore.Mvc.Versioning.Test.v2
+{
+    public class TodoAppService_Tests : AspNetCoreMvcVersioningTestBase
+    {
+        private readonly ITodoAppService _todoAppService;
+
+        public TodoAppService_Tests()
+        {
+            _todoAppService = ServiceProvider.GetRequiredService<ITodoAppService>();
+        }
+
+        [Fact]
+        public void Get()
+        {
+            _todoAppService.Get(42).ShouldBe("42-2.0");
+        }
+    }
+}

framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj

@@ -11,12 +11,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Volo\Abp\Emailing\TestTemplates\*.*" />
+    <EmbeddedResource Include="Volo\Abp\Emailing\TestTemplates\*\*.tpl" />
-    <None Remove="Volo\Abp\Emailing\TestTemplates\*.*" />
+    <None Remove="Volo\Abp\Emailing\TestTemplates\*\*.tpl" />
+    <EmbeddedResource Include="Volo\Abp\Emailing\Localization\*.json" />
+    <None Remove="Volo\Abp\Emailing\Localization\*.json" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Volo.Abp.Emailing\Volo.Abp.Emailing.csproj" />
+    <ProjectReference Include="..\..\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
   </ItemGroup>

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/AbpEmailingTestModule.cs

@@ -1,6 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Emailing.Localization;
-using Volo.Abp.Emailing.Templates;
+using Volo.Abp.Localization;
-using Volo.Abp.Emailing.Templates.Virtual;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
 
@@ -18,12 +17,13 @@ namespace Volo.Abp.Emailing
                 options.FileSets.AddEmbedded<AbpEmailingTestModule>();
             });
 
-            Configure<EmailTemplateOptions>(options =>
+            Configure<AbpLocalizationOptions>(options =>
             {
-                options.Templates["template1"] =
+                options.Resources
-                    new EmailTemplateDefinition("template1")
+                    .Add<AbpEmailingTestResource>()
-                        .SetVirtualFilePath("/Volo/Abp/Emailing/TestTemplates/template1.html");
+                    .AddVirtualJson("/Volo/Abp/Emailing/Localization");
             });
+
         }
     }
-}
+}

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/EmailTemplateRender_Tests.cs

@@ -0,0 +1,64 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.Emailing.Templates;
+using Xunit;
+
+namespace Volo.Abp.Emailing
+{
+    public class EmailTemplateRender_Tests : AbpIntegratedTest<AbpEmailingTestModule>
+    {
+        protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
+        {
+            options.UseAutofac();
+        }
+
+        private readonly ITemplateRender _templateRender;
+
+        public EmailTemplateRender_Tests()
+        {
+            _templateRender = GetRequiredService<ITemplateRender>();
+        }
+
+        [Fact]
+        public async Task RenderAsync()
+        {
+            var template = "Hello {{email}} {{ for order in orders }}{{ order.id }}:{{ order.name }},{{ end }}";
+
+            var model = new ModelClass
+            {
+                Email = "john@abp.io",
+                Orders = new List<ModelClass.Order>
+                {
+                    new ModelClass.Order
+                    {
+                        Id = "1",
+                        Name = "iphone"
+                    },
+                    new ModelClass.Order
+                    {
+                        Id = "2",
+                        Name = "ipad"
+                    }
+                }
+            };
+
+            var result = await _templateRender.RenderAsync(template, model);
+            result.ShouldBe("Hello john@abp.io 1:iphone,2:ipad,");
+        }
+
+        public class ModelClass
+        {
+            public string Email { get; set; }
+
+            public List<Order> Orders { get; set; }
+
+            public class Order
+            {
+                public string Id { get; set; }
+
+                public string Name { get; set; }
+            }
+        }
+    }
+}

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/EmailTemplateStore_Tests.cs

@@ -7,6 +7,11 @@ namespace Volo.Abp.Emailing
 {
     public class EmailTemplateStore_Tests : AbpIntegratedTest<AbpEmailingTestModule>
     {
+        protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
+        {
+            options.UseAutofac();
+        }
+
         private readonly IEmailTemplateProvider _emailTemplateProvider;
 
         public EmailTemplateStore_Tests()
@@ -17,8 +22,31 @@ namespace Volo.Abp.Emailing
         [Fact]
         public async Task Should_Get_Registered_Template()
         {
-            var template = await _emailTemplateProvider.GetAsync("template1");
+            var template = await _emailTemplateProvider.GetAsync("template1", "tr");
-            template.Content.ShouldContain("This is a test template!");
+            template.Content.ShouldContain("Lütfen aşağıdaki bağlantıya tıklayarak e-posta adresinizi onaylayın.");
+        }
+
+        [Fact]
+        public async Task Should_Get_Default_Culture_Template()
+        {
+            var template = await _emailTemplateProvider.GetAsync("template1", "zh-Hans");
+            template.Content.ShouldContain("Please confirm your email address by clicking the link below.");
+        }
+
+        [Fact]
+        public async Task Should_Get_Registered_Template_With_Layout()
+        {
+            var template = await _emailTemplateProvider.GetAsync("template2", "en");
+
+            template.Content.ShouldContain("<body>\r\n    " + "Please confirm your email address by clicking the link below.");
+        }
+
+
+        [Fact]
+        public async Task Should_Get_Registered_Template_With_Localize()
+        {
+            var template = await _emailTemplateProvider.GetAsync("template3", "tr");
+            template.Content.ShouldContain("Merhaba Abp");
         }
     }
 }

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/Localization/AbpEmailingTestResource.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Volo.Abp.Emailing.Localization
+{
+    public class AbpEmailingTestResource
+    {
+    }
+}

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/Localization/en.json

@@ -0,0 +1,6 @@
+{
+  "culture": "en",
+  "texts": {
+    "hello": "hello"
+  }
+}

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/Localization/tr.json

@@ -0,0 +1,6 @@
+{
+  "culture": "tr",
+  "texts": {
+    "hello": "Merhaba"
+  }
+}

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestEmailTemplateProvider.cs

@@ -0,0 +1,24 @@
+using Volo.Abp.Emailing.Localization;
+using Volo.Abp.Emailing.Templates;
+using Volo.Abp.Emailing.Templates.VirtualFiles;
+
+namespace Volo.Abp.Emailing
+{
+    public class TestEmailTemplateProvider : EmailTemplateDefinitionProvider
+    {
+        public override void Define(IEmailTemplateDefinitionContext context)
+        {
+            var template1 = new EmailTemplateDefinition("template1", defaultCultureName: "en", layout: null)
+                .AddTemplateVirtualFiles("/Volo/Abp/Emailing/TestTemplates/Template1");
+            context.Add(template1);
+
+            var template2 = new EmailTemplateDefinition("template2", layout: StandardEmailTemplates.DefaultLayout)
+                .AddTemplateVirtualFiles("/Volo/Abp/Emailing/TestTemplates/Template2");
+            context.Add(template2);
+
+            var template3 = new EmailTemplateDefinition("template3", layout: null, singleTemplateFile: true, localizationResource: typeof(AbpEmailingTestResource))
+                .AddTemplateVirtualFile("/Volo/Abp/Emailing/TestTemplates/Template3/Template.tpl");
+            context.Add(template3);
+        }
+    }
+}

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestTemplates/Template1/en.tpl

@@ -0,0 +1,4 @@
+Please confirm your email address by clicking the link below.
+We may need to send you critical information about our service and it is important that we have an accurate email address.
+
+<a href="#">Confirm email address</a>

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestTemplates/Template1/tr.tpl

@@ -0,0 +1,4 @@
+Lütfen aşağıdaki bağlantıya tıklayarak e-posta adresinizi onaylayın.
+Size hizmetimizle ilgili kritik bilgileri göndermemiz gerekebilir ve doğru bir e-posta adresimizin olması önemlidir.
+
+<a href="#">E-posta adresini onayla</a>

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestTemplates/Template2/en.tpl

@@ -0,0 +1,4 @@
+Please confirm your email address by clicking the link below.
+We may need to send you critical information about our service and it is important that we have an accurate email address.
+
+<a href="#">Confirm email address</a>

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestTemplates/Template3/Template.tpl

@@ -0,0 +1 @@
+{{#L:hello}} Abp

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestTemplates/template1.html

@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta charset="utf-8" />
-</head>
-<body>
-    This is a test template!
-</body>
-</html>

framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs

@@ -35,7 +35,7 @@ namespace Volo.Abp.TestApp.Application
             var phone = new Phone(person.Id, phoneDto.Number, phoneDto.Type);
 
             person.Phones.Add(phone);
-
+            Repository.Update(person);
             return ObjectMapper.Map<Phone, PhoneDto>(phone);
         }
 
@@ -43,6 +43,7 @@ namespace Volo.Abp.TestApp.Application
         {
             var person = await GetEntityByIdAsync(id);
             person.Phones.RemoveAll(p => p.Number == number);
+            Repository.Update(person);
         }
 
         public Task<GetWithComplexTypeInput> GetWithComplexType(GetWithComplexTypeInput input)

modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>

modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>

modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityRoleController.cs

@@ -10,6 +10,7 @@ namespace Volo.Abp.Identity
     [RemoteService]
     [Area("identity")]
     [ControllerName("Role")]
+    [Route("api/identity/role")]
     public class IdentityRoleController : AbpController, IIdentityRoleAppService
     {
         private readonly IIdentityRoleAppService _roleAppService;
@@ -19,31 +20,41 @@ namespace Volo.Abp.Identity
             _roleAppService = roleAppService;
         }
 
+        [HttpGet]
+        [Route("{id}")]
         public virtual Task<IdentityRoleDto> GetAsync(Guid id)
         {
             return _roleAppService.GetAsync(id);
         }
 
+        [HttpGet]
         public virtual Task<PagedResultDto<IdentityRoleDto>> GetListAsync(GetIdentityRolesInput input)
         {
             return _roleAppService.GetListAsync(input);
         }
 
+        [HttpPost]
         public virtual Task<IdentityRoleDto> CreateAsync(IdentityRoleCreateDto input)
         {
             return _roleAppService.CreateAsync(input);
         }
 
+        [HttpPut]
+        [Route("{id}")]
         public virtual Task<IdentityRoleDto> UpdateAsync(Guid id, IdentityRoleUpdateDto input)
         {
             return _roleAppService.UpdateAsync(id, input);
         }
 
+        [HttpDelete]
+        [Route("{id}")]
         public virtual Task DeleteAsync(Guid id)
         {
             return _roleAppService.DeleteAsync(id);
         }
 
+        [HttpGet]
+        [Route("all")]
         public virtual Task<List<IdentityRoleDto>> GetAllListAsync()
         {
             return _roleAppService.GetAllListAsync();

modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserController.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.Application.Dtos;
@@ -9,6 +9,7 @@ namespace Volo.Abp.Identity
     [RemoteService]
     [Area("identity")]
     [ControllerName("User")]
+    [Route("api/identity/user")]
     public class IdentityUserController : AbpController, IIdentityUserAppService
     {
         private readonly IIdentityUserAppService _userAppService;
@@ -18,48 +19,62 @@ namespace Volo.Abp.Identity
             _userAppService = userAppService;
         }
 
+        [HttpGet]
+        [Route("{id}")]
         public virtual Task<IdentityUserDto> GetAsync(Guid id)
         {
             return _userAppService.GetAsync(id);
         }
 
+        [HttpGet]
         public virtual Task<PagedResultDto<IdentityUserDto>> GetListAsync(GetIdentityUsersInput input)
         {
             return _userAppService.GetListAsync(input);
         }
 
+        [HttpPost]
         public virtual Task<IdentityUserDto> CreateAsync(IdentityUserCreateDto input)
         {
             return _userAppService.CreateAsync(input);
         }
 
+        [HttpPut]
+        [Route("{id}")]
         public virtual Task<IdentityUserDto> UpdateAsync(Guid id, IdentityUserUpdateDto input)
         {
             return _userAppService.UpdateAsync(id, input);
         }
 
+        [HttpDelete]
+        [Route("{id}")]
         public virtual Task DeleteAsync(Guid id)
         {
             return _userAppService.DeleteAsync(id);
         }
 
+        [HttpGet]
+        [Route("{id}/roles")]
         public virtual Task<ListResultDto<IdentityRoleDto>> GetRolesAsync(Guid id)
         {
             return _userAppService.GetRolesAsync(id);
         }
 
+        [HttpPut]
+        [Route("{id}/roles")]
         public virtual Task UpdateRolesAsync(Guid id, IdentityUserUpdateRolesDto input)
         {
             return _userAppService.UpdateRolesAsync(id, input);
         }
 
         [HttpGet]
+        [Route("by-username/{userName}")]
         public virtual Task<IdentityUserDto> FindByUsernameAsync(string username)
         {
             return _userAppService.FindByUsernameAsync(username);
         }
 
         [HttpGet]
+        [Route("by-email/{email}")]
         public virtual Task<IdentityUserDto> FindByEmailAsync(string email)
         {
             return _userAppService.FindByEmailAsync(email);

samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj

@@ -24,7 +24,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>

templates/mvc-module/.gitignore

@@ -252,4 +252,7 @@ paket-files/
 *.sln.iml
 
 # MyProjectName
-app/MyCompanyName.MyProjectName.DemoApp/Logs/logs.txt
+host/MyCompanyName.MyProjectName.IdentityServer/Logs/logs.txt
+host/MyCompanyName.MyProjectName.HttpApi.Host/Logs/logs.txt
+host/MyCompanyName.MyProjectName.Web.Host/Logs/logs.txt
+host/MyCompanyName.MyProjectName.Web.Unified/Logs/logs.txt

templates/mvc-module/MyCompanyName.MyProjectName.sln

@@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{649A3FFA-182
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{E400416D-2895-4512-9D17-90681EEC7E0A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{E400416D-2895-4512-9D17-90681EEC7E0A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore", "src\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj", "{0CE86223-D31D-4315-A1F5-87BA3EE1B844}"
 EndProject
@@ -25,19 +25,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Client", "src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj", "{36E2735F-CEAB-44C8-A6D1-2CDAFF399751}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Web", "src\MyCompanyName.MyProjectName.Web\MyCompanyName.MyProjectName.Web.csproj", "{8C5B0D35-9734-4439-977C-2F1AC9E1D69E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.TestBase", "test\MyCompanyName.MyProjectName.TestBase\MyCompanyName.MyProjectName.TestBase.csproj", "{C5BB573D-3030-4BCB-88B7-F6A85C32766C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.TestBase", "test\MyCompanyName.MyProjectName.TestBase\MyCompanyName.MyProjectName.TestBase.csproj", "{6E5B22E7-E2DB-45D4-B828-8019D8FD51E8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore.Tests", "test\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj", "{527F645C-C1FC-406E-8479-81386C8ECF13}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Tests", "test\MyCompanyName.MyProjectName.Domain.Tests\MyCompanyName.MyProjectName.Domain.Tests.csproj", "{44FB6636-5427-415D-8883-CB7E42D548F2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.MongoDB.Tests", "test\MyCompanyName.MyProjectName.MongoDB.Tests\MyCompanyName.MyProjectName.MongoDB.Tests.csproj", "{D0AD9179-125C-40B2-A8EE-CD4C1EE24BB6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore.Tests", "test\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj", "{E5906DE1-B2F5-472E-BE1B-1D96A68B834D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Tests", "test\MyCompanyName.MyProjectName.Domain.Tests\MyCompanyName.MyProjectName.Domain.Tests.csproj", "{E60895E5-79C4-447D-88B7-85CB5BA336A4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.MongoDB.Tests", "test\MyCompanyName.MyProjectName.MongoDB.Tests\MyCompanyName.MyProjectName.MongoDB.Tests.csproj", "{AA783A34-86E4-41A5-AE21-5D9FBD98D858}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Tests", "test\MyCompanyName.MyProjectName.Application.Tests\MyCompanyName.MyProjectName.Application.Tests.csproj", "{90CB5DC4-C040-45C7-8900-9688B26405BC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Tests", "test\MyCompanyName.MyProjectName.Application.Tests\MyCompanyName.MyProjectName.Application.Tests.csproj", "{13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Host", "host\MyCompanyName.MyProjectName.HttpApi.Host\MyCompanyName.MyProjectName.HttpApi.Host.csproj", "{37B135B0-DAFE-4616-B25C-1BDF32FC44A2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.DemoApp", "app\MyCompanyName.MyProjectName.DemoApp\MyCompanyName.MyProjectName.DemoApp.csproj", "{E7353C9A-4357-4A40-A39A-52B73F5A0CA1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Web", "src\MyCompanyName.MyProjectName.Web\MyCompanyName.MyProjectName.Web.csproj", "{3B7B6317-1B85-4164-8E11-75574F80AE17}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp", "test\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj", "{1EDCD6D4-DF3A-4E3B-ABB6-C0D0B373EAB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Web.Host", "host\MyCompanyName.MyProjectName.Web.Host\MyCompanyName.MyProjectName.Web.Host.csproj", "{73513786-B6C6-4A21-89C5-0FBDD0A46107}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.IdentityServer", "host\MyCompanyName.MyProjectName.IdentityServer\MyCompanyName.MyProjectName.IdentityServer.csproj", "{690203F4-3CD5-4569-88D9-EE831EEA5F5F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Host.Shared", "host\MyCompanyName.MyProjectName.Host.Shared\MyCompanyName.MyProjectName.Host.Shared.csproj", "{F6AC8D4A-EDD7-4514-8E8A-5BCB019864DB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Web.Unified", "host\MyCompanyName.MyProjectName.Web.Unified\MyCompanyName.MyProjectName.Web.Unified.csproj", "{3D872C41-E226-45C8-89C1-9D3DBD7C73F2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -77,34 +87,54 @@ Global
 		{36E2735F-CEAB-44C8-A6D1-2CDAFF399751}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{36E2735F-CEAB-44C8-A6D1-2CDAFF399751}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{36E2735F-CEAB-44C8-A6D1-2CDAFF399751}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C5B0D35-9734-4439-977C-2F1AC9E1D69E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5BB573D-3030-4BCB-88B7-F6A85C32766C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C5B0D35-9734-4439-977C-2F1AC9E1D69E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5BB573D-3030-4BCB-88B7-F6A85C32766C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C5B0D35-9734-4439-977C-2F1AC9E1D69E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5BB573D-3030-4BCB-88B7-F6A85C32766C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C5B0D35-9734-4439-977C-2F1AC9E1D69E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5BB573D-3030-4BCB-88B7-F6A85C32766C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E5B22E7-E2DB-45D4-B828-8019D8FD51E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{527F645C-C1FC-406E-8479-81386C8ECF13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E5B22E7-E2DB-45D4-B828-8019D8FD51E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{527F645C-C1FC-406E-8479-81386C8ECF13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E5B22E7-E2DB-45D4-B828-8019D8FD51E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{527F645C-C1FC-406E-8479-81386C8ECF13}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E5B22E7-E2DB-45D4-B828-8019D8FD51E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{527F645C-C1FC-406E-8479-81386C8ECF13}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44FB6636-5427-415D-8883-CB7E42D548F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0AD9179-125C-40B2-A8EE-CD4C1EE24BB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44FB6636-5427-415D-8883-CB7E42D548F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0AD9179-125C-40B2-A8EE-CD4C1EE24BB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44FB6636-5427-415D-8883-CB7E42D548F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0AD9179-125C-40B2-A8EE-CD4C1EE24BB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44FB6636-5427-415D-8883-CB7E42D548F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0AD9179-125C-40B2-A8EE-CD4C1EE24BB6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5906DE1-B2F5-472E-BE1B-1D96A68B834D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E60895E5-79C4-447D-88B7-85CB5BA336A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5906DE1-B2F5-472E-BE1B-1D96A68B834D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E60895E5-79C4-447D-88B7-85CB5BA336A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5906DE1-B2F5-472E-BE1B-1D96A68B834D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E60895E5-79C4-447D-88B7-85CB5BA336A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5906DE1-B2F5-472E-BE1B-1D96A68B834D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E60895E5-79C4-447D-88B7-85CB5BA336A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA783A34-86E4-41A5-AE21-5D9FBD98D858}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90CB5DC4-C040-45C7-8900-9688B26405BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA783A34-86E4-41A5-AE21-5D9FBD98D858}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90CB5DC4-C040-45C7-8900-9688B26405BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA783A34-86E4-41A5-AE21-5D9FBD98D858}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90CB5DC4-C040-45C7-8900-9688B26405BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA783A34-86E4-41A5-AE21-5D9FBD98D858}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90CB5DC4-C040-45C7-8900-9688B26405BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37B135B0-DAFE-4616-B25C-1BDF32FC44A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37B135B0-DAFE-4616-B25C-1BDF32FC44A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37B135B0-DAFE-4616-B25C-1BDF32FC44A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37B135B0-DAFE-4616-B25C-1BDF32FC44A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7353C9A-4357-4A40-A39A-52B73F5A0CA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B7B6317-1B85-4164-8E11-75574F80AE17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7353C9A-4357-4A40-A39A-52B73F5A0CA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B7B6317-1B85-4164-8E11-75574F80AE17}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7353C9A-4357-4A40-A39A-52B73F5A0CA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B7B6317-1B85-4164-8E11-75574F80AE17}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7353C9A-4357-4A40-A39A-52B73F5A0CA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B7B6317-1B85-4164-8E11-75574F80AE17}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EDCD6D4-DF3A-4E3B-ABB6-C0D0B373EAB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EDCD6D4-DF3A-4E3B-ABB6-C0D0B373EAB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EDCD6D4-DF3A-4E3B-ABB6-C0D0B373EAB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1EDCD6D4-DF3A-4E3B-ABB6-C0D0B373EAB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{73513786-B6C6-4A21-89C5-0FBDD0A46107}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73513786-B6C6-4A21-89C5-0FBDD0A46107}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73513786-B6C6-4A21-89C5-0FBDD0A46107}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73513786-B6C6-4A21-89C5-0FBDD0A46107}.Release|Any CPU.Build.0 = Release|Any CPU
+		{690203F4-3CD5-4569-88D9-EE831EEA5F5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{690203F4-3CD5-4569-88D9-EE831EEA5F5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{690203F4-3CD5-4569-88D9-EE831EEA5F5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{690203F4-3CD5-4569-88D9-EE831EEA5F5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6AC8D4A-EDD7-4514-8E8A-5BCB019864DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6AC8D4A-EDD7-4514-8E8A-5BCB019864DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6AC8D4A-EDD7-4514-8E8A-5BCB019864DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6AC8D4A-EDD7-4514-8E8A-5BCB019864DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D872C41-E226-45C8-89C1-9D3DBD7C73F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D872C41-E226-45C8-89C1-9D3DBD7C73F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D872C41-E226-45C8-89C1-9D3DBD7C73F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D872C41-E226-45C8-89C1-9D3DBD7C73F2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -118,13 +148,18 @@ Global
 		{F1C58097-4C08-4D88-8976-6B3389391481} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
 		{077AA5F8-8B61-420C-A6B5-0150A66FDB34} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
 		{36E2735F-CEAB-44C8-A6D1-2CDAFF399751} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
-		{8C5B0D35-9734-4439-977C-2F1AC9E1D69E} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{C5BB573D-3030-4BCB-88B7-F6A85C32766C} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
-		{6E5B22E7-E2DB-45D4-B828-8019D8FD51E8} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
+		{527F645C-C1FC-406E-8479-81386C8ECF13} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
-		{44FB6636-5427-415D-8883-CB7E42D548F2} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
+		{D0AD9179-125C-40B2-A8EE-CD4C1EE24BB6} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
-		{E5906DE1-B2F5-472E-BE1B-1D96A68B834D} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
+		{E60895E5-79C4-447D-88B7-85CB5BA336A4} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
-		{AA783A34-86E4-41A5-AE21-5D9FBD98D858} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
+		{90CB5DC4-C040-45C7-8900-9688B26405BC} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
-		{13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
+		{37B135B0-DAFE-4616-B25C-1BDF32FC44A2} = {E400416D-2895-4512-9D17-90681EEC7E0A}
-		{E7353C9A-4357-4A40-A39A-52B73F5A0CA1} = {E400416D-2895-4512-9D17-90681EEC7E0A}
+		{3B7B6317-1B85-4164-8E11-75574F80AE17} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{1EDCD6D4-DF3A-4E3B-ABB6-C0D0B373EAB8} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
+		{73513786-B6C6-4A21-89C5-0FBDD0A46107} = {E400416D-2895-4512-9D17-90681EEC7E0A}
+		{690203F4-3CD5-4569-88D9-EE831EEA5F5F} = {E400416D-2895-4512-9D17-90681EEC7E0A}
+		{F6AC8D4A-EDD7-4514-8E8A-5BCB019864DB} = {E400416D-2895-4512-9D17-90681EEC7E0A}
+		{3D872C41-E226-45C8-89C1-9D3DBD7C73F2} = {E400416D-2895-4512-9D17-90681EEC7E0A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD}

templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppDbContext.cs

@@ -1,28 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using MyCompanyName.MyProjectName.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.Identity.EntityFrameworkCore;
-using Volo.Abp.PermissionManagement.EntityFrameworkCore;
-using Volo.Abp.SettingManagement.EntityFrameworkCore;
-
-namespace MyCompanyName.MyProjectName.DemoApp
-{
-    public class DemoAppDbContext : AbpDbContext<DemoAppDbContext>
-    {
-        public DemoAppDbContext(DbContextOptions<DemoAppDbContext> options)
-            : base(options)
-        {
-
-        }
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
-
-            modelBuilder.ConfigurePermissionManagement();
-            modelBuilder.ConfigureSettingManagement();
-            modelBuilder.ConfigureIdentity();
-            modelBuilder.ConfigureMyProjectName();
-        }
-    }
-}

templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppDbContextFactory.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Design;
-using Microsoft.Extensions.Configuration;
-
-namespace MyCompanyName.MyProjectName.DemoApp
-{
-    public class DemoAppDbContextFactory : IDesignTimeDbContextFactory<DemoAppDbContext>
-    {
-        public DemoAppDbContext CreateDbContext(string[] args)
-        {
-            var configuration = BuildConfiguration();
-
-            var builder = new DbContextOptionsBuilder<DemoAppDbContext>()
-                .UseSqlServer(configuration.GetConnectionString("Default"));
-
-            return new DemoAppDbContext(builder.Options);
-        }
-
-        private static IConfigurationRoot BuildConfiguration()
-        {
-            var builder = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile("appsettings.json", optional: false);
-
-            return builder.Build();
-        }
-    }
-}

templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs

@@ -1,131 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using MyCompanyName.MyProjectName.EntityFrameworkCore;
-using Swashbuckle.AspNetCore.Swagger;
-using System.IO;
-using System.Linq;
-using Volo.Abp;
-using Volo.Abp.Account.Web;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Autofac;
-using Volo.Abp.Data;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore.SqlServer;
-using Volo.Abp.Identity;
-using Volo.Abp.Identity.EntityFrameworkCore;
-using Volo.Abp.Identity.Web;
-using Volo.Abp.Localization;
-using Volo.Abp.Modularity;
-using Volo.Abp.PermissionManagement;
-using Volo.Abp.PermissionManagement.EntityFrameworkCore;
-using Volo.Abp.PermissionManagement.Identity;
-using Volo.Abp.SettingManagement.EntityFrameworkCore;
-using Volo.Abp.Threading;
-using Volo.Abp.VirtualFileSystem;
-
-namespace MyCompanyName.MyProjectName.DemoApp
-{
-    [DependsOn(
-        typeof(MyProjectNameWebModule),
-        typeof(MyProjectNameApplicationModule),
-        typeof(MyProjectNameEntityFrameworkCoreModule),
-
-        typeof(AbpPermissionManagementEntityFrameworkCoreModule),
-        typeof(AbpSettingManagementEntityFrameworkCoreModule),
-        typeof(AbpIdentityEntityFrameworkCoreModule),
-        typeof(AbpEntityFrameworkCoreSqlServerModule),
-
-        typeof(AbpAccountWebModule),
-        typeof(AbpIdentityWebModule),
-        typeof(AbpIdentityApplicationModule),
-        typeof(AbpPermissionManagementApplicationModule),
-        typeof(AbpPermissionManagementDomainIdentityModule),
-        typeof(AbpAutofacModule),
-        typeof(AbpAspNetCoreMvcUiBasicThemeModule)
-        )]
-    public class DemoAppModule : AbpModule
-    {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            var hostingEnvironment = context.Services.GetHostingEnvironment();
-            var configuration = context.Services.BuildConfiguration();
-
-            Configure<DbConnectionOptions>(options =>
-            {
-                options.ConnectionStrings.Default = configuration.GetConnectionString("Default");
-            });
-
-            Configure<AbpDbContextOptions>(options =>
-            {
-                options.UseSqlServer();
-            });
-
-            if (hostingEnvironment.IsDevelopment())
-            {
-                Configure<VirtualFileSystemOptions>(options =>
-                {
-                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Web", Path.DirectorySeparatorChar)));
-                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain", Path.DirectorySeparatorChar)));
-                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameApplicationModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Application", Path.DirectorySeparatorChar)));
-                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameApplicationContractsModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Application.Contracts", Path.DirectorySeparatorChar)));
-                });
-            }
-
-            context.Services.AddSwaggerGen(
-                options =>
-                {
-                    options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" });
-                    options.DocInclusionPredicate((docName, description) => true);
-                    options.CustomSchemaIds(type => type.FullName);
-                });
-
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Languages.Add(new LanguageInfo("en", "en", "English"));
-                //...add other languages
-            });
-        }
-
-        public override void OnApplicationInitialization(ApplicationInitializationContext context)
-        {
-            var app = context.GetApplicationBuilder();
-
-            if (context.GetEnvironment().IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-            else
-            {
-                app.UseErrorPage();
-            }
-
-            app.UseVirtualFiles();
-
-            app.UseSwagger();
-            app.UseSwaggerUI(options =>
-            {
-                options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API");
-            });
-
-            app.UseAuthentication();
-            app.UseAbpRequestLocalization();
-            app.UseAuditing();
-
-            app.UseMvcWithDefaultRouteAndArea();
-
-            using (var scope = context.ServiceProvider.CreateScope())
-            {
-                AsyncHelper.RunSync(async () =>
-                {
-                    await scope.ServiceProvider
-                        .GetRequiredService<IDataSeeder>()
-                        .SeedAsync();
-                });
-            }
-        }
-    }
-}

templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20190410095748_Initial.Designer.cs

@@ -1,421 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using MyCompanyName.MyProjectName.DemoApp;
-
-namespace MyCompanyName.MyProjectName.DemoApp.Migrations
-{
-    [DbContext(typeof(DemoAppDbContext))]
-    [Migration("20190410095748_Initial")]
-    partial class Initial
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
-
-                    b.Property<bool>("IsStatic");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<string>("Regex")
-                        .HasMaxLength(512);
-
-                    b.Property<string>("RegexDescription")
-                        .HasMaxLength(128);
-
-                    b.Property<bool>("Required");
-
-                    b.Property<int>("ValueType");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("AbpClaimTypes");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
-
-                    b.Property<bool>("IsDefault")
-                        .HasColumnName("IsDefault");
-
-                    b.Property<bool>("IsPublic")
-                        .HasColumnName("IsPublic");
-
-                    b.Property<bool>("IsStatic")
-                        .HasColumnName("IsStatic");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<string>("NormalizedName")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedName");
-
-                    b.ToTable("AbpRoles");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ClaimType")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ClaimValue")
-                        .HasMaxLength(1024);
-
-                    b.Property<Guid>("RoleId");
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AbpRoleClaims");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AccessFailedCount")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("AccessFailedCount")
-                        .HasDefaultValue(0);
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp");
-
-                    b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime");
-
-                    b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId");
-
-                    b.Property<Guid?>("DeleterId")
-                        .HasColumnName("DeleterId");
-
-                    b.Property<DateTime?>("DeletionTime")
-                        .HasColumnName("DeletionTime");
-
-                    b.Property<string>("Email")
-                        .HasColumnName("Email")
-                        .HasMaxLength(256);
-
-                    b.Property<bool>("EmailConfirmed")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("EmailConfirmed")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
-
-                    b.Property<bool>("IsDeleted")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("IsDeleted")
-                        .HasDefaultValue(false);
-
-                    b.Property<DateTime?>("LastModificationTime")
-                        .HasColumnName("LastModificationTime");
-
-                    b.Property<Guid?>("LastModifierId")
-                        .HasColumnName("LastModifierId");
-
-                    b.Property<bool>("LockoutEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("LockoutEnabled")
-                        .HasDefaultValue(false);
-
-                    b.Property<DateTimeOffset?>("LockoutEnd");
-
-                    b.Property<string>("Name")
-                        .HasColumnName("Name")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("NormalizedEmail")
-                        .HasColumnName("NormalizedEmail")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("NormalizedUserName")
-                        .IsRequired()
-                        .HasColumnName("NormalizedUserName")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("PasswordHash")
-                        .HasColumnName("PasswordHash")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("PhoneNumber")
-                        .HasColumnName("PhoneNumber")
-                        .HasMaxLength(16);
-
-                    b.Property<bool>("PhoneNumberConfirmed")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("PhoneNumberConfirmed")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("SecurityStamp")
-                        .IsRequired()
-                        .HasColumnName("SecurityStamp")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("Surname")
-                        .HasColumnName("Surname")
-                        .HasMaxLength(64);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId");
-
-                    b.Property<bool>("TwoFactorEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("TwoFactorEnabled")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasColumnName("UserName")
-                        .HasMaxLength(256);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Email");
-
-                    b.HasIndex("NormalizedEmail");
-
-                    b.HasIndex("NormalizedUserName");
-
-                    b.HasIndex("UserName");
-
-                    b.ToTable("AbpUsers");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ClaimType")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ClaimValue")
-                        .HasMaxLength(1024);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.Property<Guid>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AbpUserClaims");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
-                {
-                    b.Property<Guid>("UserId");
-
-                    b.Property<string>("LoginProvider")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ProviderDisplayName")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .IsRequired()
-                        .HasMaxLength(196);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("UserId", "LoginProvider");
-
-                    b.HasIndex("LoginProvider", "ProviderKey");
-
-                    b.ToTable("AbpUserLogins");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
-                {
-                    b.Property<Guid>("UserId");
-
-                    b.Property<Guid>("RoleId");
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("UserId", "RoleId");
-
-                    b.HasIndex("RoleId", "UserId");
-
-                    b.ToTable("AbpUserRoles");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
-                {
-                    b.Property<Guid>("UserId");
-
-                    b.Property<string>("LoginProvider")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(128);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.Property<string>("Value");
-
-                    b.HasKey("UserId", "LoginProvider", "Name");
-
-                    b.ToTable("AbpUserTokens");
-                });
-
-            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .IsRequired()
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ProviderName")
-                        .IsRequired()
-                        .HasMaxLength(64);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Name", "ProviderName", "ProviderKey");
-
-                    b.ToTable("AbpPermissionGrants");
-                });
-
-            modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ProviderName")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(2048);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Name", "ProviderName", "ProviderKey");
-
-                    b.ToTable("AbpSettings");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole")
-                        .WithMany("Claims")
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
-                        .WithMany("Claims")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
-                        .WithMany("Logins")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole")
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
-                        .WithMany("Roles")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
-                        .WithMany("Tokens")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20190410095748_Initial.cs

@@ -1,313 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace MyCompanyName.MyProjectName.DemoApp.Migrations
-{
-    public partial class Initial : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "AbpClaimTypes",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(nullable: false),
-                    ExtraProperties = table.Column<string>(nullable: true),
-                    ConcurrencyStamp = table.Column<string>(maxLength: 256, nullable: false),
-                    Name = table.Column<string>(maxLength: 256, nullable: false),
-                    Required = table.Column<bool>(nullable: false),
-                    IsStatic = table.Column<bool>(nullable: false),
-                    Regex = table.Column<string>(maxLength: 512, nullable: true),
-                    RegexDescription = table.Column<string>(maxLength: 128, nullable: true),
-                    Description = table.Column<string>(maxLength: 256, nullable: true),
-                    ValueType = table.Column<int>(nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AbpClaimTypes", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AbpPermissionGrants",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(nullable: false),
-                    TenantId = table.Column<Guid>(nullable: true),
-                    Name = table.Column<string>(maxLength: 128, nullable: false),
-                    ProviderName = table.Column<string>(maxLength: 64, nullable: false),
-                    ProviderKey = table.Column<string>(maxLength: 64, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AbpPermissionGrants", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AbpRoles",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(nullable: false),
-                    ExtraProperties = table.Column<string>(nullable: true),
-                    ConcurrencyStamp = table.Column<string>(maxLength: 256, nullable: false),
-                    TenantId = table.Column<Guid>(nullable: true),
-                    Name = table.Column<string>(maxLength: 256, nullable: false),
-                    NormalizedName = table.Column<string>(maxLength: 256, nullable: false),
-                    IsDefault = table.Column<bool>(nullable: false),
-                    IsStatic = table.Column<bool>(nullable: false),
-                    IsPublic = table.Column<bool>(nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AbpRoles", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AbpSettings",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(nullable: false),
-                    Name = table.Column<string>(maxLength: 128, nullable: false),
-                    Value = table.Column<string>(maxLength: 2048, nullable: false),
-                    ProviderName = table.Column<string>(maxLength: 64, nullable: true),
-                    ProviderKey = table.Column<string>(maxLength: 64, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AbpSettings", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AbpUsers",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(nullable: false),
-                    ExtraProperties = table.Column<string>(nullable: true),
-                    ConcurrencyStamp = table.Column<string>(nullable: true),
-                    CreationTime = table.Column<DateTime>(nullable: false),
-                    CreatorId = table.Column<Guid>(nullable: true),
-                    LastModificationTime = table.Column<DateTime>(nullable: true),
-                    LastModifierId = table.Column<Guid>(nullable: true),
-                    IsDeleted = table.Column<bool>(nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(nullable: true),
-                    DeletionTime = table.Column<DateTime>(nullable: true),
-                    TenantId = table.Column<Guid>(nullable: true),
-                    UserName = table.Column<string>(maxLength: 256, nullable: false),
-                    NormalizedUserName = table.Column<string>(maxLength: 256, nullable: false),
-                    Name = table.Column<string>(maxLength: 64, nullable: true),
-                    Surname = table.Column<string>(maxLength: 64, nullable: true),
-                    Email = table.Column<string>(maxLength: 256, nullable: true),
-                    NormalizedEmail = table.Column<string>(maxLength: 256, nullable: true),
-                    EmailConfirmed = table.Column<bool>(nullable: false, defaultValue: false),
-                    PasswordHash = table.Column<string>(maxLength: 256, nullable: true),
-                    SecurityStamp = table.Column<string>(maxLength: 256, nullable: false),
-                    PhoneNumber = table.Column<string>(maxLength: 16, nullable: true),
-                    PhoneNumberConfirmed = table.Column<bool>(nullable: false, defaultValue: false),
-                    TwoFactorEnabled = table.Column<bool>(nullable: false, defaultValue: false),
-                    LockoutEnd = table.Column<DateTimeOffset>(nullable: true),
-                    LockoutEnabled = table.Column<bool>(nullable: false, defaultValue: false),
-                    AccessFailedCount = table.Column<int>(nullable: false, defaultValue: 0)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AbpUsers", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AbpRoleClaims",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(nullable: false),
-                    TenantId = table.Column<Guid>(nullable: true),
-                    ClaimType = table.Column<string>(maxLength: 256, nullable: false),
-                    ClaimValue = table.Column<string>(maxLength: 1024, nullable: true),
-                    RoleId = table.Column<Guid>(nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AbpRoleClaims", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_AbpRoleClaims_AbpRoles_RoleId",
-                        column: x => x.RoleId,
-                        principalTable: "AbpRoles",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AbpUserClaims",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(nullable: false),
-                    TenantId = table.Column<Guid>(nullable: true),
-                    ClaimType = table.Column<string>(maxLength: 256, nullable: false),
-                    ClaimValue = table.Column<string>(maxLength: 1024, nullable: true),
-                    UserId = table.Column<Guid>(nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AbpUserClaims", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_AbpUserClaims_AbpUsers_UserId",
-                        column: x => x.UserId,
-                        principalTable: "AbpUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AbpUserLogins",
-                columns: table => new
-                {
-                    UserId = table.Column<Guid>(nullable: false),
-                    LoginProvider = table.Column<string>(maxLength: 64, nullable: false),
-                    TenantId = table.Column<Guid>(nullable: true),
-                    ProviderKey = table.Column<string>(maxLength: 196, nullable: false),
-                    ProviderDisplayName = table.Column<string>(maxLength: 128, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AbpUserLogins", x => new { x.UserId, x.LoginProvider });
-                    table.ForeignKey(
-                        name: "FK_AbpUserLogins_AbpUsers_UserId",
-                        column: x => x.UserId,
-                        principalTable: "AbpUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AbpUserRoles",
-                columns: table => new
-                {
-                    UserId = table.Column<Guid>(nullable: false),
-                    RoleId = table.Column<Guid>(nullable: false),
-                    TenantId = table.Column<Guid>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AbpUserRoles", x => new { x.UserId, x.RoleId });
-                    table.ForeignKey(
-                        name: "FK_AbpUserRoles_AbpRoles_RoleId",
-                        column: x => x.RoleId,
-                        principalTable: "AbpRoles",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_AbpUserRoles_AbpUsers_UserId",
-                        column: x => x.UserId,
-                        principalTable: "AbpUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AbpUserTokens",
-                columns: table => new
-                {
-                    UserId = table.Column<Guid>(nullable: false),
-                    LoginProvider = table.Column<string>(maxLength: 64, nullable: false),
-                    Name = table.Column<string>(maxLength: 128, nullable: false),
-                    TenantId = table.Column<Guid>(nullable: true),
-                    Value = table.Column<string>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AbpUserTokens", x => new { x.UserId, x.LoginProvider, x.Name });
-                    table.ForeignKey(
-                        name: "FK_AbpUserTokens_AbpUsers_UserId",
-                        column: x => x.UserId,
-                        principalTable: "AbpUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpPermissionGrants_Name_ProviderName_ProviderKey",
-                table: "AbpPermissionGrants",
-                columns: new[] { "Name", "ProviderName", "ProviderKey" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpRoleClaims_RoleId",
-                table: "AbpRoleClaims",
-                column: "RoleId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpRoles_NormalizedName",
-                table: "AbpRoles",
-                column: "NormalizedName");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpSettings_Name_ProviderName_ProviderKey",
-                table: "AbpSettings",
-                columns: new[] { "Name", "ProviderName", "ProviderKey" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpUserClaims_UserId",
-                table: "AbpUserClaims",
-                column: "UserId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpUserLogins_LoginProvider_ProviderKey",
-                table: "AbpUserLogins",
-                columns: new[] { "LoginProvider", "ProviderKey" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpUserRoles_RoleId_UserId",
-                table: "AbpUserRoles",
-                columns: new[] { "RoleId", "UserId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpUsers_Email",
-                table: "AbpUsers",
-                column: "Email");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpUsers_NormalizedEmail",
-                table: "AbpUsers",
-                column: "NormalizedEmail");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpUsers_NormalizedUserName",
-                table: "AbpUsers",
-                column: "NormalizedUserName");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpUsers_UserName",
-                table: "AbpUsers",
-                column: "UserName");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "AbpClaimTypes");
-
-            migrationBuilder.DropTable(
-                name: "AbpPermissionGrants");
-
-            migrationBuilder.DropTable(
-                name: "AbpRoleClaims");
-
-            migrationBuilder.DropTable(
-                name: "AbpSettings");
-
-            migrationBuilder.DropTable(
-                name: "AbpUserClaims");
-
-            migrationBuilder.DropTable(
-                name: "AbpUserLogins");
-
-            migrationBuilder.DropTable(
-                name: "AbpUserRoles");
-
-            migrationBuilder.DropTable(
-                name: "AbpUserTokens");
-
-            migrationBuilder.DropTable(
-                name: "AbpRoles");
-
-            migrationBuilder.DropTable(
-                name: "AbpUsers");
-        }
-    }
-}

templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/DemoAppDbContextModelSnapshot.cs

@@ -1,419 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using MyCompanyName.MyProjectName.DemoApp;
-
-namespace MyCompanyName.MyProjectName.DemoApp.Migrations
-{
-    [DbContext(typeof(DemoAppDbContext))]
-    partial class DemoAppDbContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
-
-                    b.Property<bool>("IsStatic");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<string>("Regex")
-                        .HasMaxLength(512);
-
-                    b.Property<string>("RegexDescription")
-                        .HasMaxLength(128);
-
-                    b.Property<bool>("Required");
-
-                    b.Property<int>("ValueType");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("AbpClaimTypes");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
-
-                    b.Property<bool>("IsDefault")
-                        .HasColumnName("IsDefault");
-
-                    b.Property<bool>("IsPublic")
-                        .HasColumnName("IsPublic");
-
-                    b.Property<bool>("IsStatic")
-                        .HasColumnName("IsStatic");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<string>("NormalizedName")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedName");
-
-                    b.ToTable("AbpRoles");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ClaimType")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ClaimValue")
-                        .HasMaxLength(1024);
-
-                    b.Property<Guid>("RoleId");
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AbpRoleClaims");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AccessFailedCount")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("AccessFailedCount")
-                        .HasDefaultValue(0);
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp");
-
-                    b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime");
-
-                    b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId");
-
-                    b.Property<Guid?>("DeleterId")
-                        .HasColumnName("DeleterId");
-
-                    b.Property<DateTime?>("DeletionTime")
-                        .HasColumnName("DeletionTime");
-
-                    b.Property<string>("Email")
-                        .HasColumnName("Email")
-                        .HasMaxLength(256);
-
-                    b.Property<bool>("EmailConfirmed")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("EmailConfirmed")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
-
-                    b.Property<bool>("IsDeleted")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("IsDeleted")
-                        .HasDefaultValue(false);
-
-                    b.Property<DateTime?>("LastModificationTime")
-                        .HasColumnName("LastModificationTime");
-
-                    b.Property<Guid?>("LastModifierId")
-                        .HasColumnName("LastModifierId");
-
-                    b.Property<bool>("LockoutEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("LockoutEnabled")
-                        .HasDefaultValue(false);
-
-                    b.Property<DateTimeOffset?>("LockoutEnd");
-
-                    b.Property<string>("Name")
-                        .HasColumnName("Name")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("NormalizedEmail")
-                        .HasColumnName("NormalizedEmail")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("NormalizedUserName")
-                        .IsRequired()
-                        .HasColumnName("NormalizedUserName")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("PasswordHash")
-                        .HasColumnName("PasswordHash")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("PhoneNumber")
-                        .HasColumnName("PhoneNumber")
-                        .HasMaxLength(16);
-
-                    b.Property<bool>("PhoneNumberConfirmed")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("PhoneNumberConfirmed")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("SecurityStamp")
-                        .IsRequired()
-                        .HasColumnName("SecurityStamp")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("Surname")
-                        .HasColumnName("Surname")
-                        .HasMaxLength(64);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId");
-
-                    b.Property<bool>("TwoFactorEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("TwoFactorEnabled")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasColumnName("UserName")
-                        .HasMaxLength(256);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Email");
-
-                    b.HasIndex("NormalizedEmail");
-
-                    b.HasIndex("NormalizedUserName");
-
-                    b.HasIndex("UserName");
-
-                    b.ToTable("AbpUsers");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ClaimType")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ClaimValue")
-                        .HasMaxLength(1024);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.Property<Guid>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AbpUserClaims");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
-                {
-                    b.Property<Guid>("UserId");
-
-                    b.Property<string>("LoginProvider")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ProviderDisplayName")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .IsRequired()
-                        .HasMaxLength(196);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("UserId", "LoginProvider");
-
-                    b.HasIndex("LoginProvider", "ProviderKey");
-
-                    b.ToTable("AbpUserLogins");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
-                {
-                    b.Property<Guid>("UserId");
-
-                    b.Property<Guid>("RoleId");
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("UserId", "RoleId");
-
-                    b.HasIndex("RoleId", "UserId");
-
-                    b.ToTable("AbpUserRoles");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
-                {
-                    b.Property<Guid>("UserId");
-
-                    b.Property<string>("LoginProvider")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(128);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.Property<string>("Value");
-
-                    b.HasKey("UserId", "LoginProvider", "Name");
-
-                    b.ToTable("AbpUserTokens");
-                });
-
-            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .IsRequired()
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ProviderName")
-                        .IsRequired()
-                        .HasMaxLength(64);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Name", "ProviderName", "ProviderKey");
-
-                    b.ToTable("AbpPermissionGrants");
-                });
-
-            modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ProviderName")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(2048);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Name", "ProviderName", "ProviderKey");
-
-                    b.ToTable("AbpSettings");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole")
-                        .WithMany("Claims")
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
-                        .WithMany("Claims")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
-                        .WithMany("Logins")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole")
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
-                        .WithMany("Roles")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
-                        .WithMany("Tokens")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj

@@ -1,38 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.1.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj" />
-    <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.Web\MyCompanyName.MyProjectName.Web.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.Application\Volo.Abp.PermissionManagement.Application.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.Application\Volo.Abp.Identity.Application.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.Web\Volo.Abp.Identity.Web.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.PermissionManagement.Domain.Identity\Volo.Abp.PermissionManagement.Domain.Identity.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\account\src\Volo.Abp.Account.Web\Volo.Abp.Account.Web.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.EntityFrameworkCore.SqlServer\Volo.Abp.EntityFrameworkCore.SqlServer.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.EntityFrameworkCore\Volo.Abp.PermissionManagement.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.EntityFrameworkCore\Volo.Abp.SettingManagement.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.EntityFrameworkCore\Volo.Abp.Identity.EntityFrameworkCore.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Remove="Logs\**" />
-    <Content Remove="Logs\**" />
-    <EmbeddedResource Remove="Logs\**" />
-    <None Remove="Logs\**" />
-  </ItemGroup>
-
-</Project>

templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Pages/Index.cshtml

@@ -1,4 +0,0 @@
-@page
-@model MyCompanyName.MyProjectName.DemoApp.Pages.IndexModel
-<h3>Welcome to the MyProjectName demo application.</h3>
-<a href="/Account/Login">Login</a>