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,25 +24,28 @@ public class CliService : ITransientDependency
         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;
         }
 
         public async Task RunAsync(string[] args)
         {
             Logger.LogInformation("ABP CLI (https://abp.io)");
-            
+
             var commandLineArgs = CommandLineArgumentParser.Parse(args);
 
 #if !DEBUG
@@ -147,7 +150,7 @@ private async Task RunBatchAsync(CommandLineArgs commandLineArgs)
                 await RunInternalAsync(args);
             }
         }
-        
+
         private async Task RunInternalAsync(CommandLineArgs commandLineArgs)
         {
             var commandType = CommandSelector.Select(commandLineArgs);
@@ -203,7 +206,7 @@ private async Task<SemanticVersion> GetCurrentCliVersionInternalAsync(Assembly a
         {
             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 @@ public class AddModuleCommand : IConsoleCommand, ITransientDependency
         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 @@ public AddModuleInfoOutput LastAddedModuleInfo
             }
         }
 
-        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 @@ public async Task ExecuteAsync(CommandLineArgs commandLineArgs)
             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 @@ private string FindDbContextName(string dbMigrationsFolder)
             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 @@ private static string AddMigrationAndGetOutput(string dbMigrationsFolder, string
             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 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien
 
         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 @@ protected void ExtractProjectZip(ProjectBuildResult project, string outputFolder
             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 @@ private async Task InstallSuiteIfNotInstalledAsync()
 
         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 @@ private async Task InstallSuiteAsync(string version = null, bool preview = false
                     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 @@ private async Task UpdateSuiteAsync(string version = null, bool preview = false)
                     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 @@ private void ShowSuiteManualUpdateCommand()
             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 @@ public string GetUsageInfo()
             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;
         }