Merge pull request #1691 from abpframework/maliming/CLIUiFramework

CliAnalytics add UiFramework field.

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Analyticses/CliAnalyticsCollectInputDto.cs

@@ -16,6 +16,8 @@ namespace Volo.Abp.Cli.ProjectBuilding.Analyticses
 
         public bool? IsTiered { get; set; }
 
+        public string UiFramework { get; set; }
+
         public string Options { get; set; }
 
         public string Language { get; set; }

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

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Volo.Abp.Cli.Commands;
 using Volo.Abp.Cli.Licensing;
 using Volo.Abp.Cli.ProjectBuilding.Analyticses;
 using Volo.Abp.Cli.ProjectBuilding.Building;
@@ -73,10 +74,16 @@ namespace Volo.Abp.Cli.ProjectBuilding
 
             // Exclude unwanted or known options.
             var options = args.ExtraProperties
-                .Where(x => x.Key != CliConsts.Command)
+                .Where(x => !x.Key.Equals(CliConsts.Command, StringComparison.InvariantCultureIgnoreCase))
-                .Where(x => x.Key != "tiered")
+                .Where(x => !x.Key.Equals("tiered", StringComparison.InvariantCultureIgnoreCase))
-                .Where(x => x.Key != "database-provider" && x.Key != "d")
+                .Where(x => !x.Key.Equals(NewCommand.Options.DatabaseProvider.Long, StringComparison.InvariantCultureIgnoreCase) && 
-                .Where(x => x.Key != "output-folder" && x.Key != "o")
+                            !x.Key.Equals(NewCommand.Options.DatabaseProvider.Short, StringComparison.InvariantCultureIgnoreCase))
+                .Where(x => !x.Key.Equals(NewCommand.Options.OutputFolder.Long, StringComparison.InvariantCultureIgnoreCase) &&
+                            !x.Key.Equals(NewCommand.Options.OutputFolder.Short, StringComparison.InvariantCultureIgnoreCase))
+                .Where(x => !x.Key.Equals(NewCommand.Options.UiFramework.Long, StringComparison.InvariantCultureIgnoreCase) &&
+                            !x.Key.Equals(NewCommand.Options.UiFramework.Short, StringComparison.InvariantCultureIgnoreCase))
+                .Where(x => !x.Key.Equals(NewCommand.Options.Version.Long, StringComparison.InvariantCultureIgnoreCase) &&
+                            !x.Key.Equals(NewCommand.Options.Version.Short, StringComparison.InvariantCultureIgnoreCase))
                 .Select(x => x.Key).ToList();
 
             await CliAnalyticsCollect.CollectAsync(new CliAnalyticsCollectInputDto
@@ -85,6 +92,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
                 Command = args.ExtraProperties.ContainsKey(CliConsts.Command) ? args.ExtraProperties[CliConsts.Command] : "",
                 DatabaseProvider = args.DatabaseProvider.ToProviderName(),
                 IsTiered = args.ExtraProperties.ContainsKey("tiered"),
+                UiFramework = args.UiFramework.ToFrameworkName(),
                 Options = JsonSerializer.Serialize(options),
                 ProjectName = args.SolutionName.FullName,
                 TemplateName = args.TemplateName,