Merge pull request #10363 from abpframework/studio-dev

Merge Studio dev into Dev

.gitignore

@@ -314,7 +314,7 @@ abp-build-config.json
 tempkey.jwk
 
 # ABP Analyzing files
-*.abppkg.analyze.json
+# [Disabled for now] *.abppkg.analyze.json
 
 # appsettings.secrets.json
 appsettings.secrets.json

build/common.ps1

@@ -7,6 +7,7 @@ $rootFolder = (Get-Item -Path "./" -Verbose).FullName
 # List of solutions used only in development mode
 $solutionPaths = @(
 		"../framework",
+		"../studio",
 		"../modules/basic-theme",
 		"../modules/users",
 		"../modules/permission-management",
@@ -19,7 +20,8 @@ $solutionPaths = @(
 		"../modules/background-jobs",
 		"../modules/account",
 		"../modules/cms-kit",
-		"../modules/blob-storing-database"
+		"../modules/blob-storing-database",
+		"../studio"
 	)
 
 if ($full -eq "-f")

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultDotNetProjectBuilder.cs

@@ -9,6 +9,13 @@ namespace Volo.Abp.Cli.Build
 {
     public class DefaultDotNetProjectBuilder : IDotNetProjectBuilder, ITransientDependency
     {
+        public ICmdHelper CmdHelper { get; }
+
+        public DefaultDotNetProjectBuilder(ICmdHelper cmdHelper)
+        {
+            CmdHelper = cmdHelper;
+        }
+
         public List<string> BuildProjects(List<DotNetProjectInfo> projects, string arguments)
         {
             var builtProjects = new ConcurrentBag<string>();

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs

@@ -24,17 +24,20 @@ namespace Volo.Abp.Cli
         protected ICommandSelector CommandSelector { get; }
         protected IServiceScopeFactory ServiceScopeFactory { get; }
         protected NuGetService NuGetService { get; }
+        public ICmdHelper CmdHelper { get; }
 
         public CliService(
             ICommandLineArgumentParser commandLineArgumentParser,
             ICommandSelector commandSelector,
             IServiceScopeFactory serviceScopeFactory,
-            NuGetService nugetService)
+            NuGetService nugetService,
+            ICmdHelper cmdHelper)
         {
             CommandLineArgumentParser = commandLineArgumentParser;
             CommandSelector = commandSelector;
             ServiceScopeFactory = serviceScopeFactory;
             NuGetService = nugetService;
+            CmdHelper = cmdHelper;
 
             Logger = NullLogger<CliService>.Instance;
         }
@@ -42,7 +45,7 @@ namespace Volo.Abp.Cli
         public async Task RunAsync(string[] args)
         {
             Logger.LogInformation("ABP CLI (https://abp.io)");
-            
+
             var commandLineArgs = CommandLineArgumentParser.Parse(args);
 
 #if !DEBUG
@@ -147,7 +150,7 @@ namespace Volo.Abp.Cli
                 await RunInternalAsync(args);
             }
         }
-        
+
         private async Task RunInternalAsync(CommandLineArgs commandLineArgs)
         {
             var commandType = CommandSelector.Select(commandLineArgs);
@@ -203,7 +206,7 @@ namespace Volo.Abp.Cli
         {
             SemanticVersion currentCliVersion = default;
 
-            var consoleOutput = new StringReader(CmdHelper.RunCmdAndGetOutput($"dotnet tool list -g"));
+            var consoleOutput = new StringReader(CmdHelper.RunCmdAndGetOutput($"dotnet tool list -g", out int exitCode));
             string line;
             while ((line = await consoleOutput.ReadLineAsync()) != null)
             {

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliUrls.cs

@@ -4,19 +4,18 @@ namespace Volo.Abp.Cli
 {
     public static class CliUrls
     {
-#if DEBUG
+    /*
         public const string WwwAbpIo = WwwAbpIoDevelopment;
 
         public const string AccountAbpIo = AccountAbpIoDevelopment;
 
         public const string NuGetRootPath = NuGetRootPathDevelopment;
-#else
+*/
         public const string WwwAbpIo = WwwAbpIoProduction;
 
         public const string AccountAbpIo = AccountAbpIoProduction;
 
         public const string NuGetRootPath = NuGetRootPathProduction;
-#endif
 
         public const string WwwAbpIoProduction = "https://abp.io/";
         public const string AccountAbpIoProduction = "https://account.abp.io/";

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs

@@ -18,7 +18,7 @@ namespace Volo.Abp.Cli.Commands
         public ILogger<AddModuleCommand> Logger { get; set; }
 
         protected SolutionModuleAdder SolutionModuleAdder { get; }
-        public SolutionAbpVersionFinder SolutionAbpVersionFinder { get; }
+        public SolutionPackageVersionFinder SolutionPackageVersionFinder { get; }
 
         public AddModuleInfoOutput LastAddedModuleInfo
         {
@@ -33,10 +33,10 @@ namespace Volo.Abp.Cli.Commands
             }
         }
 
-        public AddModuleCommand(SolutionModuleAdder solutionModuleAdder, SolutionAbpVersionFinder solutionAbpVersionFinder)
+        public AddModuleCommand(SolutionModuleAdder solutionModuleAdder, SolutionPackageVersionFinder solutionPackageVersionFinder)
         {
             SolutionModuleAdder = solutionModuleAdder;
-            SolutionAbpVersionFinder = solutionAbpVersionFinder;
+            SolutionPackageVersionFinder = solutionPackageVersionFinder;
             Logger = NullLogger<AddModuleCommand>.Instance;
         }
 
@@ -62,7 +62,7 @@ namespace Volo.Abp.Cli.Commands
             var version = commandLineArgs.Options.GetOrNull(Options.Version.Short, Options.Version.Long);
             if (version == null)
             {
-                version = SolutionAbpVersionFinder.Find(solutionFile);
+                version = SolutionPackageVersionFinder.Find(solutionFile);
             }
 
             var moduleInfo = await SolutionModuleAdder.AddAsync(

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs

@@ -12,10 +12,12 @@ namespace Volo.Abp.Cli.Commands
 {
     public class CreateMigrationAndRunMigratorCommand : IConsoleCommand, ITransientDependency
     {
+        public ICmdHelper CmdHelper { get; }
         public ILogger<CreateMigrationAndRunMigratorCommand> Logger { get; set; }
 
-        public CreateMigrationAndRunMigratorCommand()
+        public CreateMigrationAndRunMigratorCommand(ICmdHelper cmdHelper)
         {
+            CmdHelper = cmdHelper;
             Logger = NullLogger<CreateMigrationAndRunMigratorCommand>.Instance;
         }
 
@@ -98,7 +100,7 @@ namespace Volo.Abp.Cli.Commands
             return Path.GetFileName(dbContext).RemovePostFix(".cs");
         }
 
-        private static string AddMigrationAndGetOutput(string dbMigrationsFolder, string dbContext, string outputDirectory)
+        private string AddMigrationAndGetOutput(string dbMigrationsFolder, string dbContext, string outputDirectory)
         {
             var dbContextOption = string.IsNullOrWhiteSpace(dbContext)
                 ? string.Empty
@@ -107,12 +109,12 @@ namespace Volo.Abp.Cli.Commands
             var addMigrationCmd = $"cd \"{dbMigrationsFolder}\" && " +
                                   $"dotnet ef migrations add Initial --output-dir {outputDirectory} {dbContextOption}";
 
-            return CmdHelper.RunCmdAndGetOutput(addMigrationCmd);
+            return CmdHelper.RunCmdAndGetOutput(addMigrationCmd, out int exitCode);
         }
 
-        private static bool IsDotNetEfToolInstalled()
+        private bool IsDotNetEfToolInstalled()
         {
-            var output = CmdHelper.RunCmdAndGetOutput("dotnet tool list -g");
+            var output = CmdHelper.RunCmdAndGetOutput("dotnet tool list -g", out int exitCode);
             return output.Contains("dotnet-ef");
         }
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@@ -35,8 +35,9 @@ namespace Volo.Abp.Cli.Commands
 
         public NewCommand(TemplateProjectBuilder templateProjectBuilder
             , ITemplateInfoProvider templateInfoProvider,
-            ConnectionStringProvider connectionStringProvider)
-        : base(connectionStringProvider)
+            ConnectionStringProvider connectionStringProvider,
+            ICmdHelper cmdHelper)
+        : base(connectionStringProvider, cmdHelper)
         {
             TemplateProjectBuilder = templateProjectBuilder;
             TemplateInfoProvider = templateInfoProvider;

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs

@@ -18,11 +18,13 @@ namespace Volo.Abp.Cli.Commands
     public abstract class ProjectCreationCommandBase
     {
         public ConnectionStringProvider ConnectionStringProvider { get; }
+        public ICmdHelper CmdHelper { get; }
         public ILogger<NewCommand> Logger { get; set; }
 
-        public ProjectCreationCommandBase(ConnectionStringProvider connectionStringProvider)
+        public ProjectCreationCommandBase(ConnectionStringProvider connectionStringProvider, ICmdHelper cmdHelper)
         {
             ConnectionStringProvider = connectionStringProvider;
+            CmdHelper = cmdHelper;
 
             Logger = NullLogger<NewCommand>.Instance;
         }
@@ -204,6 +206,10 @@ namespace Volo.Abp.Cli.Commands
             bool isTiered,
             CommandLineArgs commandLineArgs)
         {
+
+#if DEBUG
+            return;
+#endif
             if (AppTemplateBase.IsAppTemplate(template))
             {
                 var isCommercial = template == AppProTemplate.TemplateName;

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs

@@ -15,13 +15,15 @@ namespace Volo.Abp.Cli.Commands
 {
     public class SuiteCommand : IConsoleCommand, ITransientDependency
     {
+        public ICmdHelper CmdHelper { get; }
         private readonly AbpNuGetIndexUrlService _nuGetIndexUrlService;
         private readonly NuGetService _nuGetService;
         private const string SuitePackageName = "Volo.Abp.Suite";
         public ILogger<SuiteCommand> Logger { get; set; }
 
-        public SuiteCommand(AbpNuGetIndexUrlService nuGetIndexUrlService, NuGetService nuGetService)
+        public SuiteCommand(AbpNuGetIndexUrlService nuGetIndexUrlService, NuGetService nuGetService, ICmdHelper cmdHelper)
         {
+            CmdHelper = cmdHelper;
             _nuGetIndexUrlService = nuGetIndexUrlService;
             _nuGetService = nuGetService;
             Logger = NullLogger<SuiteCommand>.Instance;
@@ -71,7 +73,7 @@ namespace Volo.Abp.Cli.Commands
 
         private string GetCurrentSuiteVersion()
         {
-            var dotnetToolList = CmdHelper.RunCmdAndGetOutput("dotnet tool list -g");
+            var dotnetToolList = CmdHelper.RunCmdAndGetOutput("dotnet tool list -g", out int exitCode);
 
             var suiteLine = dotnetToolList.Split(Environment.NewLine)
                 .FirstOrDefault(l => l.ToLower().StartsWith("volo.abp.suite "));
@@ -127,11 +129,11 @@ namespace Volo.Abp.Cli.Commands
                     versionOption = $" --version {version}";
                 }
 
-                var result = CmdHelper.RunCmd(
-                    $"dotnet tool install {SuitePackageName}{versionOption} --add-source {nugetIndexUrl} -g"
+                CmdHelper.RunCmd(
+                    $"dotnet tool install {SuitePackageName}{versionOption} --add-source {nugetIndexUrl} -g", out int exitCode
                 );
 
-                if (result == 0)
+                if (exitCode == 0)
                 {
                     Logger.LogInformation("ABP Suite has been successfully installed.");
                     Logger.LogInformation("You can run it with the CLI command \"abp suite\"");
@@ -197,11 +199,11 @@ namespace Volo.Abp.Cli.Commands
                     versionOption = $" --version {version}";
                 }
 
-                var result = CmdHelper.RunCmd(
-                    $"dotnet tool update {SuitePackageName}{versionOption} --add-source {nugetIndexUrl} -g"
+                CmdHelper.RunCmd(
+                    $"dotnet tool update {SuitePackageName}{versionOption} --add-source {nugetIndexUrl} -g", out int exitCode
                 );
 
-                if (result != 0)
+                if (exitCode != 0)
                 {
                     ShowSuiteManualUpdateCommand();
                 }
@@ -230,7 +232,7 @@ namespace Volo.Abp.Cli.Commands
             Logger.LogError("dotnet tool update -g Volo.Abp.Suite --add-source https://nuget.abp.io/<your-private-key>/v3/index.json");
         }
 
-        private static void RemoveSuite()
+        private void RemoveSuite()
         {
             CmdHelper.RunCmd("dotnet tool uninstall " + SuitePackageName + " -g");
         }
@@ -275,7 +277,7 @@ namespace Volo.Abp.Cli.Commands
             sb.AppendLine("  abp suite");
             sb.AppendLine("  abp suite install");
             sb.AppendLine("  abp suite install --preview");
-            sb.AppendLine("  abp suite install --version 4.2.2");            
+            sb.AppendLine("  abp suite install --version 4.2.2");
             sb.AppendLine("  abp suite update");
             sb.AppendLine("  abp suite update --preview");
             sb.AppendLine("  abp suite remove");

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs

@@ -16,14 +16,16 @@ namespace Volo.Abp.Cli.LIbs
 {
     public class InstallLibsService : IInstallLibsService, ITransientDependency
     {
+        public ICmdHelper CmdHelper { get; }
         public const string LibsDirectory = "./wwwroot/libs";
 
         public ILogger<InstallLibsService> Logger { get; set; }
 
         private readonly IJsonSerializer _jsonSerializer;
 
-        public InstallLibsService(IJsonSerializer jsonSerializer)
+        public InstallLibsService(IJsonSerializer jsonSerializer, ICmdHelper cmdHelper)
         {
+            CmdHelper = cmdHelper;
             _jsonSerializer = jsonSerializer;
             Logger = NullLogger<InstallLibsService>.Instance;
         }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs

@@ -1,3 +1,4 @@
+using System;
 using Newtonsoft.Json;
 using NuGet.Versioning;
 using System.Collections.Generic;
@@ -5,7 +6,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
-using Volo.Abp.Cli.Auth;
 using Volo.Abp.Cli.Http;
 using Volo.Abp.Cli.Licensing;
 using Volo.Abp.Cli.ProjectBuilding;
@@ -24,7 +24,6 @@ namespace Volo.Abp.Cli.NuGet
         protected IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
         private readonly IApiKeyService _apiKeyService;
         private readonly CliHttpClientFactory _cliHttpClientFactory;
-        private List<string> _proPackageList;
         private DeveloperApiKeyResult _apiKeyResult;
 
         public NuGetService(
@@ -42,10 +41,32 @@ namespace Volo.Abp.Cli.NuGet
             Logger = NullLogger<VoloNugetPackagesVersionUpdater>.Instance;
         }
 
+        public async Task<bool> PackageExistAsync(string packageId, string version = null)
+        {
+            var versionList = await GetPackageVersionListAsync(packageId, false, true);
+
+            if (versionList == null)
+            {
+                return false;
+            }
+
+            if (version == null)
+            {
+                return versionList.Any();
+            }
+
+            return versionList.Contains(version);
+        }
+
         public async Task<SemanticVersion> GetLatestVersionOrNullAsync(string packageId, bool includeNightly = false, bool includeReleaseCandidates = false)
         {
             var versionList = await GetPackageVersionListAsync(packageId, includeNightly, includeReleaseCandidates);
 
+            if (versionList == null)
+            {
+                return null;
+            }
+
             List<SemanticVersion> versions;
 
             if (!includeNightly && !includeReleaseCandidates)
@@ -77,76 +98,54 @@ namespace Volo.Abp.Cli.NuGet
         public async Task<List<string>> GetPackageVersionListAsync(string packageId, bool includeNightly = false,
             bool includeReleaseCandidates = false)
         {
-            if (AuthService.IsLoggedIn())
-            {
-                _proPackageList ??= await GetProPackageListAsync();
-            }
-
-            string url;
             if (includeNightly)
             {
-                url = $"https://www.myget.org/F/abp-nightly/api/v3/flatcontainer/{packageId.ToLowerInvariant()}/index.json";
-            }
-            else if (_proPackageList?.Contains(packageId) ?? false)
-            {
-                url = await GetNuGetUrlForCommercialPackage(packageId);
-            }
-            else
-            {
-                url = $"https://api.nuget.org/v3-flatcontainer/{packageId.ToLowerInvariant()}/index.json";
+                var includeNightlyUrl = $"https://www.myget.org/F/abp-nightly/api/v3/flatcontainer/{packageId.ToLowerInvariant()}/index.json";
+                return await GetPackageVersionListFromUrlAsync(includeNightlyUrl);
             }
 
-            var client = _cliHttpClientFactory.CreateClient(needsAuthentication: false);
+            var nugetUrl = $"https://api.nuget.org/v3-flatcontainer/{packageId.ToLowerInvariant()}/index.json";
+            var commercialUrl = await GetNuGetUrlForCommercialPackage(packageId);
 
-            using (var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
-                url,
-                cancellationToken: CancellationTokenProvider.Token,
-                logger: Logger
-            ))
-            {
-                await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
-                var responseContent = await responseMessage.Content.ReadAsStringAsync();
-                return JsonSerializer.Deserialize<NuGetVersionResultDto>(responseContent).Versions;
-            }
+            return (await GetPackageVersionListFromUrlAsync(nugetUrl)) ?? (await GetPackageVersionListFromUrlAsync(commercialUrl));
         }
 
-        private async Task<string> GetNuGetUrlForCommercialPackage(string packageId)
+        private async Task<List<string>> GetPackageVersionListFromUrlAsync(string url)
         {
-            if (_apiKeyResult == null)
+            try
             {
-                _apiKeyResult = await _apiKeyService.GetApiKeyOrNullAsync();
-            }
+                var client = _cliHttpClientFactory.CreateClient(needsAuthentication: false);
 
-            return CliUrls.GetNuGetPackageInfoUrl(_apiKeyResult.ApiKey, packageId);
+                using (var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
+                    url,
+                    cancellationToken: CancellationTokenProvider.Token,
+                    logger: Logger
+                ))
+                {
+                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
+                    var responseContent = await responseMessage.Content.ReadAsStringAsync();
+                    return JsonSerializer.Deserialize<NuGetVersionResultDto>(responseContent).Versions;
+                }
+            }
+            catch (Exception)
+            {
+                return null;
+            }
         }
 
-        private async Task<List<string>> GetProPackageListAsync()
+        private async Task<string> GetNuGetUrlForCommercialPackage(string packageId)
         {
-            var url = $"{CliUrls.WwwAbpIo}api/app/nugetPackage/proPackageNames";
-            var client = _cliHttpClientFactory.CreateClient(needsAuthentication: true);
-
-            using (var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
-                url: url,
-                cancellationToken: CancellationTokenProvider.Token,
-                logger: Logger
-            ))
+            if (_apiKeyResult == null)
             {
-                if (responseMessage.IsSuccessStatusCode)
-                {
-                    return JsonSerializer.Deserialize<List<string>>(await responseMessage.Content.ReadAsStringAsync());
-                }
-
-                var exceptionMessage = "Remote server returns '" + (int)responseMessage.StatusCode + "-" + responseMessage.ReasonPhrase + "'. ";
-                var remoteServiceErrorMessage = await RemoteServiceExceptionHandler.GetAbpRemoteServiceErrorAsync(responseMessage);
+                _apiKeyResult = await _apiKeyService.GetApiKeyOrNullAsync();
 
-                if (remoteServiceErrorMessage != null)
+                if (_apiKeyResult == null)
                 {
-                    exceptionMessage += remoteServiceErrorMessage;
+                    return null;
                 }
-
-                Logger.LogError(exceptionMessage);
-                return null;
             }
+
+            return CliUrls.GetNuGetPackageInfoUrl(_apiKeyResult.ApiKey, packageId);
         }
 
         public class NuGetVersionResultDto
@@ -155,4 +154,4 @@ namespace Volo.Abp.Cli.NuGet
             public List<string> Versions { get; set; }
         }
     }
-}
+}

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

@@ -1,6 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Volo.Abp.Cli.ProjectBuilding.Files;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 {
@@ -35,6 +39,25 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
             var solutionFile = context.GetFile(_solutionFilePath);
             solutionFile.NormalizeLineEndings();
             solutionFile.SetLines(RemoveProject(solutionFile.GetLines().ToList()));
+
+            RemoveProjectFromAbpmdlFile(context);
+        }
+
+        private void RemoveProjectFromAbpmdlFile(ProjectBuildContext context)
+        {
+            var abpmdlFile = context.FindFile(_solutionFilePath.RemovePostFix(".sln") + ".abpmdl.json");
+
+            if (abpmdlFile == null)
+            {
+                return;
+            }
+
+            var jsonRoot = JObject.Parse(abpmdlFile.Content);
+            var packagesObj = (JObject) jsonRoot["packages"];
+
+            packagesObj?.Remove(_projectName);
+
+            abpmdlFile.SetContent(jsonRoot.ToString(Formatting.Indented));
         }
 
         private List<string> RemoveProject(List<string> solutionFileLines)

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs

@@ -10,10 +10,12 @@ namespace Volo.Abp.Cli.ProjectModification
 {
     public class EfCoreMigrationManager : ITransientDependency
     {
+        public ICmdHelper CmdHelper { get; }
         public ILogger<EfCoreMigrationManager> Logger { get; set; }
 
-        public EfCoreMigrationManager()
+        public EfCoreMigrationManager(ICmdHelper cmdHelper)
         {
+            CmdHelper = cmdHelper;
             Logger = NullLogger<EfCoreMigrationManager>.Instance;
         }
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmGlobalPackagesChecker.cs

@@ -7,10 +7,12 @@ namespace Volo.Abp.Cli.ProjectModification
 {
     public class NpmGlobalPackagesChecker : ITransientDependency
     {
+        public ICmdHelper CmdHelper { get; }
         public ILogger<NpmGlobalPackagesChecker> Logger { get; set; }
 
-        public NpmGlobalPackagesChecker()
+        public NpmGlobalPackagesChecker(ICmdHelper cmdHelper)
         {
+            CmdHelper = cmdHelper;
             Logger = NullLogger<NpmGlobalPackagesChecker>.Instance;
         }
 
@@ -31,7 +33,7 @@ namespace Volo.Abp.Cli.ProjectModification
         protected virtual string GetInstalledNpmPackages()
         {
             Logger.LogInformation("Checking installed npm global packages...");
-            return CmdHelper.RunCmdAndGetOutput("npm list -g --depth 0 --silent");
+            return CmdHelper.RunCmdAndGetOutput("npm list -g --depth 0 --silent", out int exitCode);
         }
 
         protected virtual void InstallYarn()

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs

@@ -23,6 +23,7 @@ namespace Volo.Abp.Cli.ProjectModification
     {
         public ILogger<NpmPackagesUpdater> Logger { get; set; }
         protected ICancellationTokenProvider CancellationTokenProvider { get; }
+        public ICmdHelper CmdHelper { get; }
 
         private readonly PackageJsonFileFinder _packageJsonFileFinder;
         private readonly NpmGlobalPackagesChecker _npmGlobalPackagesChecker;
@@ -33,11 +34,13 @@ namespace Volo.Abp.Cli.ProjectModification
             PackageJsonFileFinder packageJsonFileFinder,
             NpmGlobalPackagesChecker npmGlobalPackagesChecker,
             ICancellationTokenProvider cancellationTokenProvider,
-            CliHttpClientFactory cliHttpClientFactory)
+            CliHttpClientFactory cliHttpClientFactory,
+            ICmdHelper cmdHelper)
         {
             _packageJsonFileFinder = packageJsonFileFinder;
             _npmGlobalPackagesChecker = npmGlobalPackagesChecker;
             CancellationTokenProvider = cancellationTokenProvider;
+            CmdHelper = cmdHelper;
             _cliHttpClientFactory = cliHttpClientFactory;
             Logger = NullLogger<NpmPackagesUpdater>.Instance;
         }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs

@@ -26,6 +26,7 @@ namespace Volo.Abp.Cli.ProjectModification
         public SourceCodeDownloadService SourceCodeDownloadService { get; }
         public AngularSourceCodeAdder AngularSourceCodeAdder { get; }
         public IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
+        public ICmdHelper CmdHelper { get; }
         private readonly CliHttpClientFactory _cliHttpClientFactory;
         public ILogger<ProjectNpmPackageAdder> Logger { get; set; }
 
@@ -33,12 +34,14 @@ namespace Volo.Abp.Cli.ProjectModification
             IJsonSerializer jsonSerializer,
             SourceCodeDownloadService sourceCodeDownloadService,
             AngularSourceCodeAdder angularSourceCodeAdder,
-            IRemoteServiceExceptionHandler remoteServiceExceptionHandler)
+            IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
+            ICmdHelper cmdHelper)
         {
             JsonSerializer = jsonSerializer;
             SourceCodeDownloadService = sourceCodeDownloadService;
             AngularSourceCodeAdder = angularSourceCodeAdder;
             RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
+            CmdHelper = cmdHelper;
             _cliHttpClientFactory = cliHttpClientFactory;
             Logger = NullLogger<ProjectNpmPackageAdder>.Instance;
         }
@@ -202,4 +205,4 @@ namespace Volo.Abp.Cli.ProjectModification
             }
         }
     }
-}
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs

@@ -25,6 +25,7 @@ namespace Volo.Abp.Cli.ProjectModification
         public BundleCommand BundleCommand { get; }
         public SourceCodeDownloadService SourceCodeDownloadService { get; }
         public SolutionFileModifier SolutionFileModifier { get; }
+        public ICmdHelper CmdHelper { get; }
 
         protected IJsonSerializer JsonSerializer { get; }
         protected ProjectNpmPackageAdder NpmPackageAdder { get; }
@@ -43,7 +44,8 @@ namespace Volo.Abp.Cli.ProjectModification
             BundleCommand bundleCommand,
             CliHttpClientFactory cliHttpClientFactory,
             SourceCodeDownloadService sourceCodeDownloadService,
-            SolutionFileModifier solutionFileModifier)
+            SolutionFileModifier solutionFileModifier,
+            ICmdHelper cmdHelper)
         {
             JsonSerializer = jsonSerializer;
             NpmPackageAdder = npmPackageAdder;
@@ -53,6 +55,7 @@ namespace Volo.Abp.Cli.ProjectModification
             BundleCommand = bundleCommand;
             SourceCodeDownloadService = sourceCodeDownloadService;
             SolutionFileModifier = solutionFileModifier;
+            CmdHelper = cmdHelper;
             _cliHttpClientFactory = cliHttpClientFactory;
             Logger = NullLogger<ProjectNugetPackageAdder>.Instance;
         }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

@@ -30,6 +30,7 @@ namespace Volo.Abp.Cli.ProjectModification
         public AngularSourceCodeAdder AngularSourceCodeAdder { get; }
         public NewCommand NewCommand { get; }
         public BundleCommand BundleCommand { get; }
+        public ICmdHelper CmdHelper { get; }
 
         protected IJsonSerializer JsonSerializer { get; }
         protected ProjectNugetPackageAdder ProjectNugetPackageAdder { get; }
@@ -58,7 +59,8 @@ namespace Volo.Abp.Cli.ProjectModification
             AngularSourceCodeAdder angularSourceCodeAdder,
             NewCommand newCommand,
             BundleCommand bundleCommand,
-            CliHttpClientFactory cliHttpClientFactory)
+            CliHttpClientFactory cliHttpClientFactory,
+            ICmdHelper cmdHelper)
         {
             JsonSerializer = jsonSerializer;
             ProjectNugetPackageAdder = projectNugetPackageAdder;
@@ -74,6 +76,7 @@ namespace Volo.Abp.Cli.ProjectModification
             AngularSourceCodeAdder = angularSourceCodeAdder;
             NewCommand = newCommand;
             BundleCommand = bundleCommand;
+            CmdHelper = cmdHelper;
             _cliHttpClientFactory = cliHttpClientFactory;
             Logger = NullLogger<SolutionModuleAdder>.Instance;
         }
@@ -620,7 +623,7 @@ namespace Volo.Abp.Cli.ProjectModification
 
             if (!string.IsNullOrEmpty(dbMigratorProject))
             {
-                CmdHelper.RunCmd("cd \"" + Path.GetDirectoryName(dbMigratorProject) + "\" && dotnet run");
+                CmdHelper.RunCmd("cd \"" + Path.GetDirectoryName(dbMigratorProject) + "\" && dotnet run", out int exitCode);
             }
         }
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionAbpVersionFinder.cs → framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionPackageVersionFinder.cs

@@ -7,15 +7,15 @@ using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Cli.ProjectModification
 {
-    public class SolutionAbpVersionFinder : ITransientDependency
+    public class SolutionPackageVersionFinder : ITransientDependency
     {
-        public string Find(string solutionFile)
+        public string Find(string solutionFile, string packagePrefix = "Volo.Abp")
         {
             var projectFilesUnderSrc = GetProjectFilesOfSolution(solutionFile);
             foreach (var projectFile in projectFilesUnderSrc)
             {
                 var content = File.ReadAllText(projectFile);
-                if (TryParseVersionFromCsprojViaXmlDocument(content, out var s))
+                if (TryParseVersionFromCsprojViaXmlDocument(content, out var s, packagePrefix))
                 {
                     return s;
                 }
@@ -24,13 +24,13 @@ namespace Volo.Abp.Cli.ProjectModification
             return null;
         }
 
-        private static bool TryParseVersionFromCsprojViaXmlDocument(string content, out string version)
+        private static bool TryParseVersionFromCsprojViaXmlDocument(string content, out string version, string packagePrefix)
         {
             var doc = new XmlDocument() { PreserveWhitespace = true };
             using (var stream = StreamHelper.GenerateStreamFromString(content))
             {
                 doc.Load(stream);
-                var nodes = doc.SelectNodes("/Project/ItemGroup/PackageReference[starts-with(@Include, 'Volo.Abp')]");
+                var nodes = doc.SelectNodes($"/Project/ItemGroup/PackageReference[starts-with(@Include, '{packagePrefix}')]");
                 var value = nodes?[0]?.Attributes?["Version"]?.Value;
                 if (value == null)
                 {
@@ -43,12 +43,12 @@ namespace Volo.Abp.Cli.ProjectModification
             }
         }
 
-        public static bool TryParseVersionFromCsprojFile(string csprojContent, out string version)
+        public static bool TryParseVersionFromCsprojFile(string csprojContent, out string version, string packagePrefix = "Volo.Abp")
         {
             try
             {
                 var matches = Regex.Matches(csprojContent,
-                      @"PackageReference\s*Include\s*=\s*\""Volo.Abp(.*?)\""\s*Version\s*=\s*\""(.*?)\""",
+                      @"PackageReference\s*Include\s*=\s*\""" + packagePrefix + @"(.*?)\""\s*Version\s*=\s*\""(.*?)\""",
                       RegexOptions.IgnoreCase |
                       RegexOptions.IgnorePatternWhitespace |
                       RegexOptions.Singleline | RegexOptions.Multiline);
@@ -72,11 +72,11 @@ namespace Volo.Abp.Cli.ProjectModification
         }
 
 
-        public static bool TryParseSemanticVersionFromCsprojFile(string csprojContent, out SemanticVersion version)
+        public static bool TryParseSemanticVersionFromCsprojFile(string csprojContent, out SemanticVersion version, string packagePrefix = "Volo.Abp")
         {
             try
             {
-                if (TryParseVersionFromCsprojFile(csprojContent, out var versionText))
+                if (TryParseVersionFromCsprojFile(csprojContent, out var versionText, packagePrefix))
                 {
                     return SemanticVersion.TryParse(versionText, out version);
                 }
@@ -90,13 +90,13 @@ namespace Volo.Abp.Cli.ProjectModification
             return false;
         }
 
-        public static bool TryFind(string solutionFile, out string version)
+        public static bool TryFind(string solutionFile, out string version, string packagePrefix = "Volo.Abp")
         {
             var projectFiles = GetProjectFilesOfSolution(solutionFile);
             foreach (var projectFile in projectFiles)
             {
                 var csprojContent = File.ReadAllText(projectFile);
-                if (TryParseVersionFromCsprojFile(csprojContent, out var parsedVersion))
+                if (TryParseVersionFromCsprojFile(csprojContent, out var parsedVersion, packagePrefix))
                 {
                     version = parsedVersion;
                     return true;
@@ -107,13 +107,13 @@ namespace Volo.Abp.Cli.ProjectModification
             return false;
         }
 
-        public static bool TryFindSemanticVersion(string solutionFile, out SemanticVersion version)
+        public static bool TryFindSemanticVersion(string solutionFile, out SemanticVersion version, string packagePrefix = "Volo.Abp")
         {
             var projectFiles = GetProjectFilesOfSolution(solutionFile);
             foreach (var projectFile in projectFiles)
             {
                 var csprojContent = File.ReadAllText(projectFile);
-                if (TryParseSemanticVersionFromCsprojFile(csprojContent, out var parsedVersion))
+                if (TryParseSemanticVersionFromCsprojFile(csprojContent, out var parsedVersion, packagePrefix))
                 {
                     version = parsedVersion;
                     return true;

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/Angular/AngularServiceProxyGenerator.cs

@@ -17,13 +17,16 @@ namespace Volo.Abp.Cli.ServiceProxying.Angular
         public const string Name = "NG";
 
         private readonly CliService _cliService;
+        private readonly ICmdHelper _cmdhelper;
 
         public AngularServiceProxyGenerator(
             CliHttpClientFactory cliHttpClientFactory,
             IJsonSerializer jsonSerializer,
+            ICmdHelper cmdhelper,
             CliService cliService) :
             base(cliHttpClientFactory, jsonSerializer)
         {
+            _cmdhelper = cmdhelper;
             _cliService = cliService;
         }
 
@@ -63,7 +66,7 @@ namespace Volo.Abp.Cli.ServiceProxying.Angular
                 commandBuilder.Append($" --target {target}");
             }
 
-            CmdHelper.RunCmd(commandBuilder.ToString());
+            _cmdhelper.RunCmd(commandBuilder.ToString());
         }
 
         private async Task CheckNgSchematicsAsync()

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs

@@ -1,14 +1,15 @@
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Cli.Utils
 {
-    public static class CmdHelper
+    public class CmdHelper :  ICmdHelper, ITransientDependency
     {
-        public static int SuccessfulExitCode = 0;
+        private const int SuccessfulExitCode = 0;
 
-        public static void OpenWebPage(string url)
+        public void OpenWebPage(string url)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
@@ -25,45 +26,57 @@ namespace Volo.Abp.Cli.Utils
             }
         }
 
-        public static void Run(string file, string arguments)
+
+        public void Run(string file, string arguments)
         {
             var procStartInfo = new ProcessStartInfo(file, arguments);
             Process.Start(procStartInfo)?.WaitForExit();
         }
 
-        public static int RunCmd(string command)
+        public void RunCmd(string command, string workingDirectory = null)
+        {
+            RunCmd(command, out _, workingDirectory);
+        }
+
+        public void RunCmd(string command, out int exitCode, string workingDirectory = null)
         {
             var procStartInfo = new ProcessStartInfo(
                 GetFileName(),
                 GetArguments(command)
             );
 
+            if (!string.IsNullOrEmpty(workingDirectory))
+            {
+                procStartInfo.WorkingDirectory = workingDirectory;
+            }
+
             using (var process = Process.Start(procStartInfo))
             {
                 process?.WaitForExit();
-                return process?.ExitCode ?? 0;
+
+                exitCode = process.ExitCode;
             }
         }
 
-        public static string RunCmdAndGetOutput(string command)
+        public string RunCmdAndGetOutput(string command, string workingDirectory = null)
         {
-            return RunCmdAndGetOutput(command, out int _);
+            return RunCmdAndGetOutput(command, out int _, workingDirectory);
         }
 
-        public static string RunCmdAndGetOutput(string command, out bool isExitCodeSuccessful)
+        public string RunCmdAndGetOutput(string command, out bool isExitCodeSuccessful, string workingDirectory = null)
         {
-            var output = RunCmdAndGetOutput(command, out int exitCode);
+            var output = RunCmdAndGetOutput(command, out int exitCode, workingDirectory);
             isExitCodeSuccessful = exitCode == SuccessfulExitCode;
             return output;
         }
 
-        public static string RunCmdAndGetOutput(string command, out int exitCode)
+        public string RunCmdAndGetOutput(string command, out int exitCode, string workingDirectory = null)
         {
             string output;
 
             using (var process = new Process())
             {
-                process.StartInfo = new ProcessStartInfo(CmdHelper.GetFileName())
+                process.StartInfo = new ProcessStartInfo(GetFileName())
                 {
                     Arguments = GetArguments(command),
                     UseShellExecute = false,
@@ -72,6 +85,11 @@ namespace Volo.Abp.Cli.Utils
                     RedirectStandardError = true
                 };
 
+                if (!string.IsNullOrEmpty(workingDirectory))
+                {
+                    process.StartInfo.WorkingDirectory = workingDirectory;
+                }
+
                 process.Start();
 
                 using (var standardOutput = process.StandardOutput)
@@ -91,7 +109,7 @@ namespace Volo.Abp.Cli.Utils
             return output.Trim();
         }
 
-        public static string GetArguments(string command)
+        public string GetArguments(string command)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
@@ -102,7 +120,7 @@ namespace Volo.Abp.Cli.Utils
             return "/C \"" + command + "\"";
         }
 
-        public static string GetFileName()
+        public string GetFileName()
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ICmdHelper.cs

@@ -0,0 +1,24 @@
+namespace Volo.Abp.Cli.Utils
+{
+    public interface ICmdHelper
+    {
+        void OpenWebPage(string url);
+
+        void Run(string file, string arguments);
+
+        string GetArguments(string command);
+
+        string GetFileName();
+
+        void RunCmd(string command, string workingDirectory = null);
+
+        void RunCmd(string command, out int exitCode, string workingDirectory = null);
+
+        string RunCmdAndGetOutput(string command, string workingDirectory = null);
+
+
+        string RunCmdAndGetOutput(string command, out bool isExitCodeSuccessful, string workingDirectory = null);
+
+        string RunCmdAndGetOutput(string command, out int exitCode, string workingDirectory = null);
+    }
+}

framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectNameValidation_Tests.cs

@@ -38,14 +38,6 @@ namespace Volo.Abp.Cli
             }
         }
 
-        [Fact]
-        public async Task Parent_Directory_Char_Contains_Test()
-        {
-
-            var args = new CommandLineArgs("new", "Test..Test");
-            await _newCommand.ExecuteAsync(args).ShouldThrowAsync<CliUsageException>();
-        }
-
         [Fact]
         public async Task Contains_Illegal_Keyword_Test()
         {

framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectVersionParse_Tests.cs

@@ -36,7 +36,7 @@ namespace Volo.Abp.Cli
                                          "</ItemGroup>" +
                                          "</Project>";
 
-            var success = SolutionAbpVersionFinder.TryParseVersionFromCsprojFile(csprojContent, out var version);
+            var success = SolutionPackageVersionFinder.TryParseVersionFromCsprojFile(csprojContent, out var version);
             success.ShouldBe(true);
             version.ShouldBe("4.4.0-rc.1");
         }
@@ -58,7 +58,7 @@ namespace Volo.Abp.Cli
                                          "</ItemGroup>" +
                                          "</Project>";
 
-            var success = SolutionAbpVersionFinder.TryParseSemanticVersionFromCsprojFile(csprojContent, out var version);
+            var success = SolutionPackageVersionFinder.TryParseSemanticVersionFromCsprojFile(csprojContent, out var version);
             success.ShouldBe(true);
             version.Major.ShouldBe(12); 
             version.Minor.ShouldBe(8); 

framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/HybridTemplateRendererProvider_Tests.cs

@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Shouldly;
+using Volo.Abp.Localization;
 using Xunit;
 
 namespace Volo.Abp.TextTemplating
@@ -16,25 +17,31 @@ namespace Volo.Abp.TextTemplating
         [Fact]
         public async Task Should_Render_By_Scriban()
         {
-            (await _templateRenderer.RenderAsync(
-                TestTemplates.HybridTemplateScriban,
-                model: new
-                {
-                    name = "John"
-                }
-            )).ShouldBe("Hello John, how are you?");
+            using (CultureHelper.Use("en"))
+            {
+                (await _templateRenderer.RenderAsync(
+                    TestTemplates.HybridTemplateScriban,
+                    model: new
+                    {
+                        name = "John"
+                    }
+                )).ShouldBe("Hello John, how are you?");
+            }
         }
 
         [Fact]
         public async Task Should_Render_By_Razor()
         {
-            (await _templateRenderer.RenderAsync(
-                TestTemplates.HybridTemplateRazor,
-                model: new HybridModel
-                {
-                    Name = "John"
-                }
-            )).ShouldBe("Hello John, how are you?");
+            using (CultureHelper.Use("en"))
+            {
+                (await _templateRenderer.RenderAsync(
+                    TestTemplates.HybridTemplateRazor,
+                    model: new HybridModel
+                    {
+                        Name = "John"
+                    }
+                )).ShouldBe("Hello John, how are you?");
+            }
         }
 
         public class HybridModel

modules/account/Volo.Abp.Account.sln

@@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Account.Applicatio
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Account.Blazor", "src\Volo.Abp.Account.Blazor\Volo.Abp.Account.Blazor.csproj", "{EE8858B3-A638-481B-8EB9-74F5E7D43D80}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Account.Installer", "src\Volo.Abp.Account.Installer\Volo.Abp.Account.Installer.csproj", "{EAAB416C-9113-486D-9B54-4DCF78FDC6AB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +63,10 @@ Global
 		{EE8858B3-A638-481B-8EB9-74F5E7D43D80}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EE8858B3-A638-481B-8EB9-74F5E7D43D80}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EE8858B3-A638-481B-8EB9-74F5E7D43D80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAAB416C-9113-486D-9B54-4DCF78FDC6AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAAB416C-9113-486D-9B54-4DCF78FDC6AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAAB416C-9113-486D-9B54-4DCF78FDC6AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAAB416C-9113-486D-9B54-4DCF78FDC6AB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -74,6 +80,7 @@ Global
 		{7BCA5955-B3F6-41E8-9D5D-D115195C6098} = {B5881429-EFF7-4F30-8C0B-0AC41E36B74E}
 		{356EAC51-5D55-4852-A8A5-2F90EAC8DAE3} = {12FAE513-7575-4235-89DF-277BA1A3B098}
 		{EE8858B3-A638-481B-8EB9-74F5E7D43D80} = {B5881429-EFF7-4F30-8C0B-0AC41E36B74E}
+		{EAAB416C-9113-486D-9B54-4DCF78FDC6AB} = {B5881429-EFF7-4F30-8C0B-0AC41E36B74E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2B054393-D2B2-4EA8-8A15-D60CBCF3E7A9}

modules/account/src/Volo.Abp.Account.Installer/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>

modules/account/src/Volo.Abp.Account.Installer/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

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

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\..\configureawait.props" />
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Remove="..\..\Volo.Abp.Account.abpmdl.json" />
+      <EmbeddedResource Include="..\..\Volo.Abp.Account.abpmdl.json" />
+    </ItemGroup>
+
+</Project>

modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AbpAccountInstallerModule.cs

@@ -0,0 +1,21 @@
+using Volo.Abp.Modularity;
+using Volo.Abp.Studio;
+using Volo.Abp.VirtualFileSystem;
+
+namespace Volo.Abp.Account
+{
+    [DependsOn(
+        typeof(AbpStudioModuleInstallerModule),
+        typeof(AbpVirtualFileSystemModule)
+        )]
+    public class AbpAccountInstallerModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpVirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<AbpAccountInstallerModule>();
+            });
+        }
+    }
+}

modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AccountInstallerPipelineBuilder.cs

@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Studio.ModuleInstalling;
+
+namespace Volo.Abp.Account
+{
+    [Dependency(ServiceLifetime.Transient, ReplaceServices = true)]
+    [ExposeServices(typeof(IModuleInstallingPipelineBuilder))]
+    public class AccountInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency
+    {
+        public async Task<ModuleInstallingPipeline> BuildAsync(ModuleInstallingContext context)
+        {
+            return GetBasePipeline(context);
+        }
+    }
+}

modules/audit-logging/Volo.Abp.AuditLogging.sln

@@ -23,6 +23,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AuditLogging.Entit
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AuditLogging.MongoDB.Tests", "test\Volo.Abp.AuditLogging.MongoDB.Tests\Volo.Abp.AuditLogging.MongoDB.Tests.csproj", "{9F04C908-F4B9-45B4-BB9A-26A1462D4D7F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AuditLogging.Installer", "src\Volo.Abp.AuditLogging.Installer\Volo.Abp.AuditLogging.Installer.csproj", "{E5F8A2AD-7D8D-4F9E-B606-737784DC90BA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +63,10 @@ Global
 		{9F04C908-F4B9-45B4-BB9A-26A1462D4D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9F04C908-F4B9-45B4-BB9A-26A1462D4D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9F04C908-F4B9-45B4-BB9A-26A1462D4D7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5F8A2AD-7D8D-4F9E-B606-737784DC90BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5F8A2AD-7D8D-4F9E-B606-737784DC90BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5F8A2AD-7D8D-4F9E-B606-737784DC90BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5F8A2AD-7D8D-4F9E-B606-737784DC90BA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -74,6 +80,7 @@ Global
 		{6CDB588F-B5FD-4F2A-9599-49ACE2D7AF83} = {971E31E2-FC37-41D3-8B6E-96848105C446}
 		{CBED3E11-0A33-4B56-A75C-A57D25C98C38} = {971E31E2-FC37-41D3-8B6E-96848105C446}
 		{9F04C908-F4B9-45B4-BB9A-26A1462D4D7F} = {971E31E2-FC37-41D3-8B6E-96848105C446}
+		{E5F8A2AD-7D8D-4F9E-B606-737784DC90BA} = {CFAB155F-5255-4D99-94E2-3361D8EA4B15}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9F36BAE5-A9CF-460C-8E7E-4580347F71F6}

modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>

modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\..\configureawait.props" />
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Remove="..\..\Volo.Abp.AuditLogging.abpmdl.json" />
+      <EmbeddedResource Include="..\..\Volo.Abp.AuditLogging.abpmdl.json" />
+    </ItemGroup>
+
+</Project>

modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AbpAuditLoggingInstallerModule.cs

@@ -0,0 +1,21 @@
+using Volo.Abp.Modularity;
+using Volo.Abp.Studio;
+using Volo.Abp.VirtualFileSystem;
+
+namespace Volo.Abp.AuditLogging
+{
+    [DependsOn(
+        typeof(AbpStudioModuleInstallerModule),
+        typeof(AbpVirtualFileSystemModule)
+        )]
+    public class AbpAuditLoggingInstallerModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpVirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<AbpAuditLoggingInstallerModule>();
+            });
+        }
+    }
+}

modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AuditLoggingInstallerPipelineBuilder.cs

@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Studio.ModuleInstalling;
+
+namespace Volo.Abp.AuditLogging
+{
+    [Dependency(ServiceLifetime.Transient, ReplaceServices = true)]
+    [ExposeServices(typeof(IModuleInstallingPipelineBuilder))]
+    public class AuditLoggingInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency
+    {
+        public async Task<ModuleInstallingPipeline> BuildAsync(ModuleInstallingContext context)
+        {
+            context.AddEfCoreConfigurationMethodDeclaration(
+                new EfCoreConfigurationMethodDeclaration(
+                    "Volo.Abp.AuditLogging.EntityFrameworkCore",
+                    "ConfigureAuditLogging"
+                )
+            );
+            
+            return GetBasePipeline(context);
+        }
+    }
+}

modules/background-jobs/Volo.Abp.BackgroundJobs.sln

@@ -35,6 +35,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.BackgroundJobs.Dem
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.BackgroundJobs.DemoApp.Quartz", "app\Volo.Abp.BackgroundJobs.DemoApp.Quartz\Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj", "{0146891D-3FF8-4516-94D6-B9EFC37383CD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.BackgroundJobs.Installer", "src\Volo.Abp.BackgroundJobs.Installer\Volo.Abp.BackgroundJobs.Installer.csproj", "{FCD1EFC7-28D6-40F5-8C9A-7DE0328D6758}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -93,6 +95,10 @@ Global
 		{0146891D-3FF8-4516-94D6-B9EFC37383CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0146891D-3FF8-4516-94D6-B9EFC37383CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0146891D-3FF8-4516-94D6-B9EFC37383CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FCD1EFC7-28D6-40F5-8C9A-7DE0328D6758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCD1EFC7-28D6-40F5-8C9A-7DE0328D6758}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FCD1EFC7-28D6-40F5-8C9A-7DE0328D6758}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FCD1EFC7-28D6-40F5-8C9A-7DE0328D6758}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -111,6 +117,7 @@ Global
 		{2060AC85-2598-4342-A87C-A684A2C71A37} = {E400416D-2895-4512-9D17-90681EEC7E0A}
 		{7C8D03F7-165E-478C-A6D6-DC8229EEABB9} = {E400416D-2895-4512-9D17-90681EEC7E0A}
 		{0146891D-3FF8-4516-94D6-B9EFC37383CD} = {E400416D-2895-4512-9D17-90681EEC7E0A}
+		{FCD1EFC7-28D6-40F5-8C9A-7DE0328D6758} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD}

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\..\configureawait.props" />
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Remove="..\..\Volo.Abp.BackgroundJobs.abpmdl.json" />
+      <EmbeddedResource Include="..\..\Volo.Abp.BackgroundJobs.abpmdl.json" />
+    </ItemGroup>
+
+</Project>

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/AbpBackgroundJobsInstallerModule.cs

@@ -0,0 +1,21 @@
+using Volo.Abp.Modularity;
+using Volo.Abp.Studio;
+using Volo.Abp.VirtualFileSystem;
+
+namespace Volo.Abp.BackgroundJobs
+{
+    [DependsOn(
+        typeof(AbpStudioModuleInstallerModule),
+        typeof(AbpVirtualFileSystemModule)
+        )]
+    public class AbpBackgroundJobsInstallerModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpVirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<AbpBackgroundJobsInstallerModule>();
+            });
+        }
+    }
+}

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/BackgroundJobsInstallerPipelineBuilder.cs

@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Studio.ModuleInstalling;
+
+namespace Volo.Abp.BackgroundJobs
+{
+    [Dependency(ServiceLifetime.Transient, ReplaceServices = true)]
+    [ExposeServices(typeof(IModuleInstallingPipelineBuilder))]
+    public class BackgroundJobsInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency
+    {
+        public async Task<ModuleInstallingPipeline> BuildAsync(ModuleInstallingContext context)
+        {
+            context.AddEfCoreConfigurationMethodDeclaration(
+                new EfCoreConfigurationMethodDeclaration(
+                    "Volo.Abp.BackgroundJobs.EntityFrameworkCore",
+                    "ConfigureBackgroundJobs"
+                )
+            );
+            
+            return GetBasePipeline(context);
+        }
+    }
+}

modules/basic-theme/Volo.Abp.BasicTheme.abpmdl.json

@@ -0,0 +1,38 @@
+{
+  "folders": {
+    "items": {
+      "src": {},
+      "test": {}
+    }
+  },
+  "packages": {
+    "Volo.Abp.AspNetCore.Components.Server.BasicTheme": {
+      "path": "src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.Abp.AspNetCore.Components.Web.BasicTheme": {
+      "path": "src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Volo.Abp.AspNetCore.Components.Web.BasicTheme.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme": {
+      "path": "src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic": {
+      "path": "src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo": {
+      "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.abppkg.json",
+      "folder": "test"
+    },
+    "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo": {
+      "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.abppkg.json",
+      "folder": "test"
+    },
+    "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests": {
+      "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.abppkg.json",
+      "folder": "test"
+    }
+  }
+}

modules/basic-theme/Volo.Abp.BasicTheme.abpsln.json

@@ -0,0 +1,7 @@
+{
+  "modules": {
+    "Volo.Abp.BasicTheme": {
+      "path": "Volo.Abp.BasicTheme.abpmdl.json"
+    }
+  }
+}

modules/basic-theme/Volo.Abp.BasicTheme.sln

@@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.UI.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests", "test\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj", "{8C336CB8-F7A9-4203-AE55-D8F5FDB2A958}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.BasicTheme.Installer", "src\Volo.Abp.BasicTheme.Installer\Volo.Abp.BasicTheme.Installer.csproj", "{3068A87F-3348-4981-8241-2630BC496117}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -52,6 +54,10 @@ Global
 		{8C336CB8-F7A9-4203-AE55-D8F5FDB2A958}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8C336CB8-F7A9-4203-AE55-D8F5FDB2A958}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8C336CB8-F7A9-4203-AE55-D8F5FDB2A958}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3068A87F-3348-4981-8241-2630BC496117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3068A87F-3348-4981-8241-2630BC496117}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3068A87F-3348-4981-8241-2630BC496117}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3068A87F-3348-4981-8241-2630BC496117}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{C8068E7F-4A04-4755-8976-C2A4C0ADC708} = {ED6D078F-B0A2-48E8-A09D-3B7CDF6CE3D1}
@@ -61,5 +67,6 @@ Global
 		{7DFA95DB-F3A1-4883-AB03-9B02E540A134} = {0BC55E3B-4964-48E3-A390-2ADD37980149}
 		{51B491ED-F959-4974-A876-528B5F16BC92} = {0BC55E3B-4964-48E3-A390-2ADD37980149}
 		{8C336CB8-F7A9-4203-AE55-D8F5FDB2A958} = {0BC55E3B-4964-48E3-A390-2ADD37980149}
+		{3068A87F-3348-4981-8241-2630BC496117} = {ED6D078F-B0A2-48E8-A09D-3B7CDF6CE3D1}
 	EndGlobalSection
 EndGlobal

modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.abppkg.json

@@ -0,0 +1 @@
+{}

modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Volo.Abp.AspNetCore.Components.Web.BasicTheme.abppkg.json

@@ -0,0 +1 @@
+{}

modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.abppkg.json

@@ -0,0 +1 @@
+{}

modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json

@@ -0,0 +1 @@
+{}

modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>

modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\..\configureawait.props" />
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Remove="..\..\Volo.Abp.BasicTheme.abpmdl.json" />
+      <EmbeddedResource Include="..\..\Volo.Abp.BasicTheme.abpmdl.json" />
+    </ItemGroup>
+
+</Project>

modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/AbpBasicThemeInstallerModule.cs

@@ -0,0 +1,21 @@
+using Volo.Abp.Modularity;
+using Volo.Abp.Studio;
+using Volo.Abp.VirtualFileSystem;
+
+namespace Volo.Abp.BasicTheme
+{
+    [DependsOn(
+        typeof(AbpStudioModuleInstallerModule),
+        typeof(AbpVirtualFileSystemModule)
+        )]
+    public class AbpBasicThemeInstallerModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpVirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<AbpBasicThemeInstallerModule>();
+            });
+        }
+    }
+}

modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/BasicThemeInstallerPipelineBuilder.cs

@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Studio.ModuleInstalling;
+
+namespace Volo.Abp.BasicTheme
+{
+    [Dependency(ServiceLifetime.Transient, ReplaceServices = true)]
+    [ExposeServices(typeof(IModuleInstallingPipelineBuilder))]
+    public class BasicThemeInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency
+    {
+        public async Task<ModuleInstallingPipeline> BuildAsync(ModuleInstallingContext context)
+        {
+            return GetBasePipeline(context);
+        }
+    }
+}

modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.test"
+}

modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.abppkg.json

@@ -0,0 +1 @@
+{}

modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.abppkg.json

@@ -0,0 +1 @@
+{}

modules/blob-storing-database/Volo.Abp.BlobStoring.Database.sln

@@ -27,6 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{9E416AD3-1
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlobStoring.Database.Host.ConsoleApp.ConsoleApp", "host\BlobStoring.Database.Host.ConsoleApp\src\BlobStoring.Database.Host.ConsoleApp.ConsoleApp\BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj", "{C3C4CB94-4F73-4D04-9076-8D98D5C6B475}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.BlobStoring.Database.Installer", "src\Volo.Abp.BlobStoring.Database.Installer\Volo.Abp.BlobStoring.Database.Installer.csproj", "{6181012D-3CBA-4825-B8A5-FD8926AE5661}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,6 +71,10 @@ Global
 		{C3C4CB94-4F73-4D04-9076-8D98D5C6B475}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C3C4CB94-4F73-4D04-9076-8D98D5C6B475}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C3C4CB94-4F73-4D04-9076-8D98D5C6B475}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6181012D-3CBA-4825-B8A5-FD8926AE5661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6181012D-3CBA-4825-B8A5-FD8926AE5661}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6181012D-3CBA-4825-B8A5-FD8926AE5661}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6181012D-3CBA-4825-B8A5-FD8926AE5661}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -83,6 +89,7 @@ Global
 		{D0AD9179-125C-40B2-A8EE-CD4C1EE24BB6} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
 		{E60895E5-79C4-447D-88B7-85CB5BA336A4} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
 		{C3C4CB94-4F73-4D04-9076-8D98D5C6B475} = {9E416AD3-1EC8-439A-9CFD-AAFFA89E2AEB}
+		{6181012D-3CBA-4825-B8A5-FD8926AE5661} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD}

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\..\configureawait.props" />
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Remove="..\..\Volo.Abp.BlobStoring.Database.abpmdl.json" />
+      <EmbeddedResource Include="..\..\Volo.Abp.BlobStoring.Database.abpmdl.json" />
+    </ItemGroup>
+
+</Project>

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseInstallerModule.cs

@@ -0,0 +1,21 @@
+using Volo.Abp.Modularity;
+using Volo.Abp.Studio;
+using Volo.Abp.VirtualFileSystem;
+
+namespace Volo.Abp.BlobStoring.Database
+{
+    [DependsOn(
+        typeof(AbpStudioModuleInstallerModule),
+        typeof(AbpVirtualFileSystemModule)
+        )]
+    public class AbpBlobStoringDatabaseInstallerModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpVirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<AbpBlobStoringDatabaseInstallerModule>();
+            });
+        }
+    }
+}

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseInstallerPipelineBuilder.cs

@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Studio.ModuleInstalling;
+
+namespace Volo.Abp.BlobStoring.Database
+{
+    [Dependency(ServiceLifetime.Transient, ReplaceServices = true)]
+    [ExposeServices(typeof(IModuleInstallingPipelineBuilder))]
+    public class BlobStoringDatabaseInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency
+    {
+        public async Task<ModuleInstallingPipeline> BuildAsync(ModuleInstallingContext context)
+        {
+            context.AddEfCoreConfigurationMethodDeclaration(
+                new EfCoreConfigurationMethodDeclaration(
+                    "Volo.Abp.BlobStoring.Database.EntityFrameworkCore",
+                    "ConfigureBlobStoring"
+                )
+            );
+            
+            return GetBasePipeline(context);
+        }
+    }
+}

modules/cms-kit/Volo.CmsKit.abpmdl.json

@@ -0,0 +1,155 @@
+{
+  "folders": {
+    "items": {
+      "src": {},
+      "test": {},
+      "host": {}
+    }
+  },
+  "packages": {
+    "Volo.CmsKit.Domain.Shared": {
+      "path": "src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Domain": {
+      "path": "src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Application.Contracts": {
+      "path": "src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Application": {
+      "path": "src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.EntityFrameworkCore": {
+      "path": "src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.MongoDB": {
+      "path": "src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.HttpApi": {
+      "path": "src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.HttpApi.Client": {
+      "path": "src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.TestBase": {
+      "path": "test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.abppkg.json",
+      "folder": "test"
+    },
+    "Volo.CmsKit.EntityFrameworkCore.Tests": {
+      "path": "test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.abppkg.json",
+      "folder": "test"
+    },
+    "Volo.CmsKit.MongoDB.Tests": {
+      "path": "test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.abppkg.json",
+      "folder": "test"
+    },
+    "Volo.CmsKit.Domain.Tests": {
+      "path": "test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.abppkg.json",
+      "folder": "test"
+    },
+    "Volo.CmsKit.Application.Tests": {
+      "path": "test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.abppkg.json",
+      "folder": "test"
+    },
+    "Volo.CmsKit.HttpApi.Host": {
+      "path": "host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.json",
+      "folder": "host"
+    },
+    "Volo.CmsKit.Web": {
+      "path": "src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.HttpApi.Client.ConsoleTestApp": {
+      "path": "test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Volo.CmsKit.HttpApi.Client.ConsoleTestApp.abppkg.json",
+      "folder": "test"
+    },
+    "Volo.CmsKit.Web.Host": {
+      "path": "host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.json",
+      "folder": "host"
+    },
+    "Volo.CmsKit.IdentityServer": {
+      "path": "host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.abppkg.json",
+      "folder": "host"
+    },
+    "Volo.CmsKit.Host.Shared": {
+      "path": "host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.abppkg.json",
+      "folder": "host"
+    },
+    "Volo.CmsKit.Web.Unified": {
+      "path": "host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.abppkg.json",
+      "folder": "host"
+    },
+    "Volo.CmsKit.Admin.Application": {
+      "path": "src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Admin.Application.Contracts": {
+      "path": "src/Volo.CmsKit.Admin.Application.Contracts/Volo.CmsKit.Admin.Application.Contracts.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Admin.HttpApi": {
+      "path": "src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Admin.HttpApi.Client": {
+      "path": "src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Admin.Web": {
+      "path": "src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Public.Application": {
+      "path": "src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Public.Application.Contracts": {
+      "path": "src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Public.HttpApi": {
+      "path": "src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Public.HttpApi.Client": {
+      "path": "src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Public.Web": {
+      "path": "src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Common.Web": {
+      "path": "src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Common.Application.Contracts": {
+      "path": "src/Volo.CmsKit.Common.Application.Contracts/Volo.CmsKit.Common.Application.Contracts.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Common.Application": {
+      "path": "src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Common.HttpApi": {
+      "path": "src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.CmsKit.Common.HttpApi.Client": {
+      "path": "src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.json",
+      "folder": "src"
+    },
+    "Volo.Abp.BlobStoring.Database.Installer": {
+      "path": "src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.abppkg.json",
+      "folder": "src"
+    }
+  }
+}

modules/cms-kit/Volo.CmsKit.abpsln.json

@@ -0,0 +1,7 @@
+{
+  "modules": {
+    "Volo.CmsKit": {
+      "path": "Volo.CmsKit.abpmdl.json"
+    }
+  }
+}

modules/cms-kit/Volo.CmsKit.sln

@@ -87,6 +87,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Common.HttpApi"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Common.HttpApi.Client", "src\Volo.CmsKit.Common.HttpApi.Client\Volo.CmsKit.Common.HttpApi.Client.csproj", "{EC98F006-2002-4CE2-AA62-5EBB589ACD79}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Installer", "src\Volo.CmsKit.Installer\Volo.CmsKit.Installer.csproj", "{908C157E-2352-4373-BF5D-E5DA19913390}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -233,6 +235,10 @@ Global
 		{EC98F006-2002-4CE2-AA62-5EBB589ACD79}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC98F006-2002-4CE2-AA62-5EBB589ACD79}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC98F006-2002-4CE2-AA62-5EBB589ACD79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{908C157E-2352-4373-BF5D-E5DA19913390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{908C157E-2352-4373-BF5D-E5DA19913390}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{908C157E-2352-4373-BF5D-E5DA19913390}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{908C157E-2352-4373-BF5D-E5DA19913390}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -277,6 +283,7 @@ Global
 		{5D9BD65D-353E-4618-BE49-E1DF4CFF2393} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1}
 		{E8CC280A-D049-4564-9C71-2F5657C17937} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1}
 		{EC98F006-2002-4CE2-AA62-5EBB589ACD79} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1}
+		{908C157E-2352-4373-BF5D-E5DA19913390} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD}

modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.abppkg.json

@@ -0,0 +1 @@
+{}

modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "host.http-api"
+}

modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.abppkg.json

@@ -0,0 +1 @@
+{}

modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "host.mvc"
+}

modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.abppkg.json

@@ -0,0 +1 @@
+{}

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo.CmsKit.Admin.Application.Contracts.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.application-contracts"
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.application"
+}

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.http-api-client"
+}

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.http-api"
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.mvc"
+}

modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.application-contracts"
+}

modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.application"
+}

modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo.CmsKit.Common.Application.Contracts.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.application-contracts"
+}

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.application"
+}

modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.http-api-client"
+}

modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.http-api"
+}

modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.mvc"
+}

modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.domain-shared"
+}

modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.domain"
+}

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.ef"
+}

modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.http-api-client"
+}

modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.http-api"
+}

modules/cms-kit/src/Volo.CmsKit.Installer/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>

modules/cms-kit/src/Volo.CmsKit.Installer/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

modules/cms-kit/src/Volo.CmsKit.Installer/Volo.Abp.BlobStoring.Database.Installer.abppkg.json

@@ -0,0 +1 @@
+{}

modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\..\configureawait.props" />
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Remove="..\..\Volo.CmsKit.abpmdl.json" />
+      <EmbeddedResource Include="..\..\Volo.CmsKit.abpmdl.json" />
+    </ItemGroup>
+
+</Project>

modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/AbpCmsKitInstallerModule.cs

@@ -0,0 +1,21 @@
+using Volo.Abp.Modularity;
+using Volo.Abp.Studio;
+using Volo.Abp.VirtualFileSystem;
+
+namespace Volo.Abp.CmsKit
+{
+    [DependsOn(
+        typeof(AbpStudioModuleInstallerModule),
+        typeof(AbpVirtualFileSystemModule)
+        )]
+    public class VoloCmsKitDatabaseInstallerModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpVirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<VoloCmsKitDatabaseInstallerModule>();
+            });
+        }
+    }
+}

modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/CmsKitInstallerPipelineBuilder.cs

@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Studio.ModuleInstalling;
+
+namespace Volo.Abp.CmsKit
+{
+    [Dependency(ServiceLifetime.Transient, ReplaceServices = true)]
+    [ExposeServices(typeof(IModuleInstallingPipelineBuilder))]
+    public class BlobStoringDatabaseInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency
+    {
+        public async Task<ModuleInstallingPipeline> BuildAsync(ModuleInstallingContext context)
+        {
+            context.AddEfCoreConfigurationMethodDeclaration(
+                new EfCoreConfigurationMethodDeclaration(
+                    "Volo.CmsKit.EntityFrameworkCore",
+                    "ConfigureCmsKit"
+                )
+            );
+            
+            return GetBasePipeline(context);
+        }
+    }
+}

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.mongodb"
+}

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.application-contracts"
+}

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.application"
+}

modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.json

@@ -0,0 +1,3 @@
+{
+  "role": "lib.http-api-client"
+}