From 144d3d3f885641d80f2746a13681aee1107929c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?SAL=C4=B0H=20=C3=96ZKARA?= <salihozkara00@gmail.com>
Date: Wed, 10 Dec 2025 13:25:36 +0300
Subject: [PATCH] Improve solution file handling and cleanup unused usings

Removed unused using directives in AbpCliCoreModule and NewCommand for better code clarity. Refactored AddPackageCommand to inline solution and project file retrieval. Enhanced TelemetrySolutionInfoEnricher to support '.slnx' files by mapping them to '.abpsln' if present.
---
 .../Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs   | 2 --
 .../Volo/Abp/Cli/Commands/AddPackageCommand.cs           | 7 ++-----
 .../Volo/Abp/Cli/Commands/NewCommand.cs                  | 1 -
 .../Activity/Providers/TelemetrySolutionInfoEnricher.cs  | 9 +++++++++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs
index cea7a38b8b..7b249f0517 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Text;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Cli.Commands;
@@ -11,7 +10,6 @@ using Volo.Abp.Cli.ServiceProxying.JavaScript;
 using Volo.Abp.Domain;
 using Volo.Abp.Http;
 using Volo.Abp.IdentityModel;
-using Volo.Abp.Internal.Telemetry.Activity.Providers;
 using Volo.Abp.Json;
 using Volo.Abp.Localization;
 using Volo.Abp.Minify;
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs
index 4cec1023b3..a8fbdb8840 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs
@@ -63,12 +63,9 @@ public class AddPackageCommand : IConsoleCommand, ITransientDependency
         {
             var addSourceCodeToSolutionFile = withSourceCode && commandLineArgs.Options.ContainsKey("add-to-solution-file");
             
-            var slnFile = GetSolutionFile(commandLineArgs);
-            var projectFile = GetProjectFile(commandLineArgs);
-            
             await ProjectNugetPackageAdder.AddAsync(
-                slnFile,
-                projectFile,
+                GetSolutionFile(commandLineArgs),
+                GetProjectFile(commandLineArgs),
                 commandLineArgs.Target,
                 version,
                 true,
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
index ac932dae67..4d02472d27 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
@@ -12,7 +12,6 @@ using Volo.Abp.Cli.LIbs;
 using Volo.Abp.Cli.ProjectBuilding;
 using Volo.Abp.Cli.ProjectBuilding.Events;
 using Volo.Abp.Cli.ProjectBuilding.Templates.Module;
-using Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule;
 using Volo.Abp.Cli.ProjectModification;
 using Volo.Abp.Cli.Utils;
 using Volo.Abp.Cli.Version;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs
index f39b3babd8..38d68f3f71 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs
@@ -188,6 +188,15 @@ internal sealed class TelemetrySolutionInfoEnricher : TelemetryActivityEventEnri
             }
         }
         
+        if (solutionPath.EndsWith(".slnx"))
+        {
+            solutionPath = solutionPath[..^5] + ".abpsln";
+            if (File.Exists(solutionPath))
+            {
+                return solutionPath;
+            }
+        }
+        
         var dir = Path.GetDirectoryName(solutionPath);
         if (dir.IsNullOrEmpty())
         {