implemented debug mode project generate #3601

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

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -52,10 +53,15 @@ namespace Volo.Abp.Cli.ProjectBuilding
             string version = null,
             string templateSource = null)
         {
-
             DirectoryHelper.CreateIfNotExists(CliPaths.TemplateCache);
-            
-            var latestVersion = await GetLatestSourceCodeVersionAsync(name, type);
+
+            string latestVersion;
+
+#if DEBUG
+            latestVersion = GetCurrentVersionFromAssembly();
+#else
+            latestVersion = await GetLatestSourceCodeVersionAsync(name, type);
+#endif
             if (version == null)
             {
                 if (latestVersion == null)
@@ -64,7 +70,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
                     Logger.LogWarning(string.Empty);
                     Logger.LogWarning("Find the following template in your cache directory: ");
                     Logger.LogWarning("\t Template Name\tVersion");
-                    
+
                     var templateList = GetLocalTemplates();
                     foreach (var cacheFile in templateList)
                     {
@@ -74,12 +80,18 @@ namespace Volo.Abp.Cli.ProjectBuilding
                     Logger.LogWarning(string.Empty);
                     throw new CliUsageException("Use command: abp new Acme.BookStore -v version");
                 }
-                
+
                 version = latestVersion;
             }
 
-            var nugetVersion = (await GetTemplateNugetVersionAsync(name, type, version)) ?? version;
-            
+            string nugetVersion;
+
+#if DEBUG
+            nugetVersion = version;
+#else
+            nugetVersion = (await GetTemplateNugetVersionAsync(name, type, version)) ?? version;
+#endif
+
             if (!string.IsNullOrWhiteSpace(templateSource) && !IsNetworkSource(templateSource))
             {
                 Logger.LogInformation("Using local " + type + ": " + name + ", version: " + version);
@@ -87,6 +99,14 @@ namespace Volo.Abp.Cli.ProjectBuilding
             }
 
             var localCacheFile = Path.Combine(CliPaths.TemplateCache, name + "-" + version + ".zip");
+
+#if DEBUG
+            if (File.Exists(localCacheFile))
+            {
+                return new TemplateFile(File.ReadAllBytes(localCacheFile), version, latestVersion, nugetVersion);
+            }
+#endif
+
             if (Options.CacheTemplates && File.Exists(localCacheFile) && templateSource.IsNullOrWhiteSpace())
             {
                 Logger.LogInformation("Using cached " + type + ": " + name + ", version: " + version);
@@ -111,7 +131,13 @@ namespace Volo.Abp.Cli.ProjectBuilding
             }
 
             return new TemplateFile(fileContent, version, latestVersion, nugetVersion);
+        }
 
+        private static string GetCurrentVersionFromAssembly()
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var fullVersion = assembly.GetName().Version.ToString(); //eg: 2.6.0.0
+            return fullVersion.Substring(0, fullVersion.LastIndexOf('.')); //eg: 2.6.0
         }
 
         private async Task<string> GetLatestSourceCodeVersionAsync(string name, string type)
@@ -224,15 +250,15 @@ namespace Volo.Abp.Cli.ProjectBuilding
 
         private List<(string TemplateName, string Version)> GetLocalTemplates()
         {
-            var templateList = new List<(string TemplateName, string Version)>(); 
-            
+            var templateList = new List<(string TemplateName, string Version)>();
+
             var stringBuilder = new StringBuilder();
             foreach (var cacheFile in Directory.GetFiles(CliPaths.TemplateCache))
             {
                 stringBuilder.AppendLine(cacheFile);
             }
 
-            var matches = Regex.Matches(stringBuilder.ToString(),$"({AppTemplate.TemplateName}|{AppProTemplate.TemplateName}|{ModuleTemplate.TemplateName}|{ModuleProTemplate.TemplateName})-(.+).zip");
+            var matches = Regex.Matches(stringBuilder.ToString(), $"({AppTemplate.TemplateName}|{AppProTemplate.TemplateName}|{ModuleTemplate.TemplateName}|{ModuleProTemplate.TemplateName})-(.+).zip");
             foreach (Match match in matches)
             {
                 templateList.Add((match.Groups[1].Value, match.Groups[2].Value));

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

@@ -4,6 +4,7 @@ using Microsoft.Extensions.Options;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
 using Volo.Abp.Cli.Commands;
 using Volo.Abp.Cli.Licensing;
 using Volo.Abp.Cli.ProjectBuilding.Analyticses;
@@ -25,12 +26,15 @@ namespace Volo.Abp.Cli.ProjectBuilding
         protected IJsonSerializer JsonSerializer { get; }
         protected IApiKeyService ApiKeyService { get; }
 
+        private readonly IConfiguration _configuration;
+
         public TemplateProjectBuilder(ISourceCodeStore sourceCodeStore,
             ITemplateInfoProvider templateInfoProvider,
             ICliAnalyticsCollect cliAnalyticsCollect,
             IOptions<AbpCliOptions> options,
             IJsonSerializer jsonSerializer,
-            IApiKeyService apiKeyService)
+            IApiKeyService apiKeyService,
+            IConfiguration configuration)
         {
             SourceCodeStore = sourceCodeStore;
             TemplateInfoProvider = templateInfoProvider;
@@ -38,6 +42,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
             Options = options.Value;
             JsonSerializer = jsonSerializer;
             ApiKeyService = apiKeyService;
+            _configuration = configuration;
 
             Logger = NullLogger<TemplateProjectBuilder>.Instance;
         }
@@ -55,7 +60,18 @@ namespace Volo.Abp.Cli.ProjectBuilding
                 args.TemplateSource
             );
 
-            var apiKeyResult = await ApiKeyService.GetApiKeyOrNullAsync();
+            DeveloperApiKeyResult apiKeyResult;
+
+#if DEBUG
+            apiKeyResult = _configuration.GetSection("apiKeyResult").Get<DeveloperApiKeyResult>(); //you can use user secrets
+            if (apiKeyResult == null)
+            {
+                apiKeyResult = await ApiKeyService.GetApiKeyOrNullAsync();
+            }
+#else
+            apiKeyResult = await ApiKeyService.GetApiKeyOrNullAsync();
+#endif
+
             if (apiKeyResult != null)
             {
                 if (apiKeyResult.ApiKey != null)

framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj

@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-
   <Import Project="..\..\..\configureawait.props" />
   <Import Project="..\..\..\common.props" />
 
@@ -9,6 +9,7 @@
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>abp</ToolCommandName>
     <RootNamespace />
+    <UserSecretsId>43599b00-4fa5-4b9f-a314-0757889b296b</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,11 +18,12 @@
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\Volo.Abp.Cli.Core\Volo.Abp.Cli.Core.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>