diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/FileSystemDotNetProjectBuildConfigReader.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/FileSystemDotNetProjectBuildConfigReader.cs index 47daa1d401b..b421ea0dd42 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/FileSystemDotNetProjectBuildConfigReader.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/FileSystemDotNetProjectBuildConfigReader.cs @@ -21,8 +21,9 @@ public FileSystemDotNetProjectBuildConfigReader(IJsonSerializer jsonSerializer) public DotNetProjectBuildConfig Read(string directoryPath) { var buildConfig = new DotNetProjectBuildConfig(); - var solutionFiles = Directory.GetFiles(directoryPath, "*.sln", SearchOption.TopDirectoryOnly); - if (solutionFiles.Length == 1) + var solutionFiles = Directory.GetFiles(directoryPath, "*.sln", SearchOption.TopDirectoryOnly) + .Concat(Directory.GetFiles(directoryPath, "*.slnx", SearchOption.TopDirectoryOnly)).ToList(); + if (solutionFiles.Count == 1) { buildConfig.SlFilePath = solutionFiles.First(); var configFile = GetClosestFile(directoryPath, _buildConfigName); @@ -86,7 +87,7 @@ private GitRepository GetGitRepositoryUsingDirectory(string directoryPath) directoryInfo = directoryInfo.Parent; } while (directoryInfo?.Parent != null); - throw new Exception("There is no solution file (*.sln) and " + _buildConfigName + + throw new Exception("There is no solution file (*.sln or *.slnx) and " + _buildConfigName + " in the working directory and working directory is not a GIT repository !"); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs index 1791a5e9280..4756c3f99b8 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Linq; using System.Text; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; @@ -118,7 +119,7 @@ public string GetUsageInfo() sb.AppendLine(""); sb.AppendLine("'add-module' command is used to add a multi-package ABP module to a solution."); - sb.AppendLine("It should be used in a folder containing a .sln file."); + sb.AppendLine("It should be used in a folder containing a .sln or .slnx file."); sb.AppendLine(""); sb.AppendLine("Usage:"); sb.AppendLine(" abp add-module [options]"); @@ -166,20 +167,21 @@ protected virtual string GetSolutionFile(CommandLineArgs commandLineArgs) return providedSolutionFile; } - var foundSolutionFiles = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.sln"); - if (foundSolutionFiles.Length == 1) + var foundSolutionFiles = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.sln") + .Concat(Directory.GetFiles(Directory.GetCurrentDirectory(), "*.slnx")).ToList(); + if (foundSolutionFiles.Count == 1) { return foundSolutionFiles[0]; } - if (foundSolutionFiles.Length == 0) + if (foundSolutionFiles.Count == 0) { - throw new CliUsageException("'abp add-module' command should be used inside a folder containing a .sln file!"); + throw new CliUsageException("'abp add-module' command should be used inside a folder containing a .sln or .slnx file!"); } //foundSolutionFiles.Length > 1 - var sb = new StringBuilder("There are multiple solution (.sln) files in the current directory. Please specify one of the files below:"); + var sb = new StringBuilder("There are multiple solution (.sln or .slnx) files in the current directory. Please specify one of the files below:"); foreach (var foundSolutionFile in foundSolutionFiles) { 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 32d9f497990..e9acb7ae24b 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 @@ -83,7 +83,7 @@ public string GetUsageInfo() sb.AppendLine(""); sb.AppendLine("'add-package' command is used to add an ABP package to a project."); - sb.AppendLine("It should be used in a folder containing a .csproj file, .sln file or packages.json."); + sb.AppendLine("It should be used in a folder containing a .csproj file, .sln file, .slnx file or packages.json."); sb.AppendLine(""); sb.AppendLine("Usage:"); sb.AppendLine(""); @@ -146,7 +146,8 @@ protected virtual string GetSolutionFile(CommandLineArgs commandLineArgs) return providedSolutionFile; } - return Directory.GetFiles(Directory.GetCurrentDirectory(), "*.sln").FirstOrDefault(); + return Directory.GetFiles(Directory.GetCurrentDirectory(), "*.sln") + .Concat(Directory.GetFiles(Directory.GetCurrentDirectory(), "*.slnx")).FirstOrDefault(); } protected virtual string GetAngularDirectory(CommandLineArgs commandLineArgs) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index dabc6b6862d..51ade9be0c4 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -175,9 +175,10 @@ protected async Task GetProjectBuildArgsAsync(CommandLineArgs if (slnPath == null) { - slnPath = Directory.GetFiles(outputFolderRoot, "*.sln").FirstOrDefault(); + slnPath = Directory.GetFiles(outputFolderRoot, "*.sln") + .Concat(Directory.GetFiles(outputFolderRoot, "*.slnx")).FirstOrDefault(); } - else if (slnPath.EndsWith(".sln")) + else if (slnPath.EndsWith(".sln") || slnPath.EndsWith(".slnx")) { Directory.SetCurrentDirectory(Path.GetDirectoryName(slnPath)); outputFolderRoot = Path.GetDirectoryName(slnPath); @@ -190,7 +191,8 @@ protected async Task GetProjectBuildArgsAsync(CommandLineArgs { Directory.SetCurrentDirectory(slnPath); outputFolderRoot = slnPath; - slnPath = Directory.GetFiles(outputFolderRoot, "*.sln").FirstOrDefault(); + slnPath = Directory.GetFiles(outputFolderRoot, "*.sln") + .Concat(Directory.GetFiles(outputFolderRoot, "*.slnx")).FirstOrDefault(); } if (slnPath == null) @@ -198,7 +200,7 @@ protected async Task GetProjectBuildArgsAsync(CommandLineArgs throw new CliUsageException($"This command should be run inside a folder that contains a microservice solution! Or use -{Options.MainSolution.Short} parameter."); } - var microserviceSolutionName = Path.GetFileName(slnPath).RemovePostFix(".sln"); + var microserviceSolutionName = Path.GetFileName(slnPath).RemovePostFix(".slnx", ".sln"); version ??= SolutionPackageVersionFinder.FindByCsprojVersion(slnPath); solutionName = SolutionName.Parse(microserviceSolutionName, projectName); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs index 48f5eca5f8b..80d5a5a13b4 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs @@ -119,7 +119,7 @@ private async Task GenerateCrudPageAsync(CommandLineArgs args) var solutionFile = args.Options.GetOrNull(Options.Crud.Solution.Short, Options.Crud.Solution.Long); if (entityFile.IsNullOrEmpty() || !entityFile.EndsWith(".json") || !File.Exists(entityFile) || - solutionFile.IsNullOrEmpty() || !solutionFile.EndsWith(".sln")) + solutionFile.IsNullOrEmpty() || !(solutionFile.EndsWith(".sln") || solutionFile.EndsWith(".slnx"))) { throw new UserFriendlyException("Invalid Arguments!"); } @@ -476,7 +476,8 @@ void OpenSuiteInBrowserWithLaunchUrl() private object GetTargetSolutionOrNull(CommandLineArgs commandLineArgs) { return commandLineArgs.Options.GetOrNull(Options.Crud.Solution.Short, Options.Crud.Solution.Long) - ?? Directory.GetFiles(Directory.GetCurrentDirectory(), "*.sln", SearchOption.TopDirectoryOnly).FirstOrDefault(); + ?? Directory.GetFiles(Directory.GetCurrentDirectory(), "*.sln", SearchOption.TopDirectoryOnly) + .Concat(Directory.GetFiles(Directory.GetCurrentDirectory(), "*.slnx", SearchOption.TopDirectoryOnly)).FirstOrDefault(); } private Process StartSuite() diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToLocalCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToLocalCommand.cs index b0889e9557e..4837b2b5a0a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToLocalCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToLocalCommand.cs @@ -70,7 +70,7 @@ private string GetWorkingDirectory(CommandLineArgs commandLineArgs) return null; } - if (path.EndsWith(".sln") || path.EndsWith(".csproj")) + if (path.EndsWith(".sln") || path.EndsWith(".slnx") || path.EndsWith(".csproj")) { return Path.GetDirectoryName(path); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs index 8c6df3b0b9f..ae3cda87239 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs @@ -64,6 +64,7 @@ private async Task UpdateNugetPackages(CommandLineArgs commandLineArgs, string d if (givenSolution.IsNullOrWhiteSpace()) { solutions.AddRange(Directory.GetFiles(directory, "*.sln", SearchOption.AllDirectories)); + solutions.AddRange(Directory.GetFiles(directory, "*.slnx", SearchOption.AllDirectories)); } else { @@ -76,7 +77,7 @@ private async Task UpdateNugetPackages(CommandLineArgs commandLineArgs, string d { foreach (var solution in solutions) { - var solutionName = Path.GetFileName(solution).RemovePostFix(".sln"); + var solutionName = Path.GetFileName(solution).RemovePostFix(".slnx", ".sln"); await _nugetPackagesVersionUpdater.UpdateSolutionAsync(solution, checkAll: checkAll, version: version, leptonXVersion: leptonXVersion); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/AppNoLayersMoveProjectsStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/AppNoLayersMoveProjectsStep.cs index e9af25d28a8..fc34c8a00d9 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/AppNoLayersMoveProjectsStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/AppNoLayersMoveProjectsStep.cs @@ -41,7 +41,7 @@ public void MoveFiles(ProjectBuildContext context, string projectFolder, string public void ModifySolutionFile(ProjectBuildContext context, string pathInSlnFile, string newPathInSlnFile) { - var slnFile = context.Files.First(file => file.Name.EndsWith(".sln")); + var slnFile = context.Files.First(file => file.Name.EndsWith(".sln") ||file.Name.EndsWith(".slnx")); slnFile.SetContent(slnFile.Content.Replace($"\"{pathInSlnFile}\"", $"\"{newPathInSlnFile}\"")); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ProjectRenameStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ProjectRenameStep.cs index a109d21f7ae..75d24a66f67 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ProjectRenameStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ProjectRenameStep.cs @@ -24,7 +24,7 @@ public override void Execute(ProjectBuildContext context) } } - var files = context.Files.Where(f => f.Name.EndsWith(".sln") || f.Name.EndsWith(".cs")); + var files = context.Files.Where(f => f.Name.EndsWith(".sln") || f.Name.EndsWith(".slnx") || f.Name.EndsWith(".cs")); foreach (var file in files) { file.NormalizeLineEndings(); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs index 3866d2c33fe..0e22d62480c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs @@ -1,49 +1,120 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; -using Newtonsoft.Json; +using System.Xml; using Newtonsoft.Json.Linq; +using Volo.Abp.Cli.ProjectBuilding.Files; +using Formatting = Newtonsoft.Json.Formatting; namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; public class RemoveProjectFromSolutionStep : ProjectBuildPipelineStep { private readonly string _projectName; - private string _solutionFilePath; + private string _solutionFilePathWithoutFileExtension; private string _projectFolderPath; private string ProjectNameWithQuotes => $"\"{_projectName}\""; public RemoveProjectFromSolutionStep( string projectName, - string solutionFilePath = null, + string solutionFilePathWithoutFileExtension = null, string projectFolderPath = null) { _projectName = projectName; - _solutionFilePath = solutionFilePath; _projectFolderPath = projectFolderPath; + + if (solutionFilePathWithoutFileExtension != null && solutionFilePathWithoutFileExtension.EndsWith(".sln")) + { + _solutionFilePathWithoutFileExtension = solutionFilePathWithoutFileExtension.RemovePostFix(".sln"); + } + + if (solutionFilePathWithoutFileExtension != null && solutionFilePathWithoutFileExtension.EndsWith(".slnx")) + { + _solutionFilePathWithoutFileExtension = solutionFilePathWithoutFileExtension.RemovePostFix(".slnx"); + } + else + { + _solutionFilePathWithoutFileExtension = solutionFilePathWithoutFileExtension; + } } public override void Execute(ProjectBuildContext context) { SetSolutionAndProjectPathsIfNull(context); - if (_solutionFilePath == null || _projectFolderPath == null) + if (_solutionFilePathWithoutFileExtension == null || _projectFolderPath == null) { return; } new RemoveFolderStep(_projectFolderPath).Execute(context); - var solutionFile = context.GetFile(_solutionFilePath); - solutionFile.NormalizeLineEndings(); - solutionFile.SetLines(RemoveProject(solutionFile.GetLines().ToList())); + var solutionFile = context.FindFile(_solutionFilePathWithoutFileExtension + ".sln") + ?? context.GetFile(_solutionFilePathWithoutFileExtension + ".slnx"); + + if (solutionFile.Name.EndsWith(".sln")) + { + RemoveProjectFromSlnFile(solutionFile); + } + else + { + RemoveProjectFromSlnxFile(solutionFile); + } RemoveProjectFromAbpmdlFile(context); } + private void RemoveProjectFromSlnxFile(FileEntry solutionFile) + { + var document = new XmlDocument { PreserveWhitespace = true }; + document.LoadXml(solutionFile.Content); + var projectNodes = document.SelectNodes("//Project"); + + if (projectNodes == null || projectNodes.Count < 1) + { + return; + } + + var nodesToBeRemoved = new List(); + foreach (XmlNode projectNode in projectNodes) + { + var pathAttr = projectNode.Attributes?["Path"]?.Value; + if (string.IsNullOrWhiteSpace(pathAttr)) + { + continue; + } + + var normalized = pathAttr.Replace('\\', '/'); + var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(normalized); + + if (string.Equals(fileNameWithoutExtension, _projectName, StringComparison.OrdinalIgnoreCase)) + { + nodesToBeRemoved.Add(projectNode); + } + } + + foreach (var node in nodesToBeRemoved) + { + node.ParentNode!.RemoveChild(node); + } + + solutionFile.SetContent( + document.OuterXml + .SplitToLines() + .Where(x=> !x.Trim().Equals(string.Empty)) + .JoinAsString(Environment.NewLine)); + } + + private void RemoveProjectFromSlnFile(FileEntry solutionFile) + { + solutionFile.NormalizeLineEndings(); + solutionFile.SetLines(RemoveProject(solutionFile.GetLines().ToList())); + } + private void RemoveProjectFromAbpmdlFile(ProjectBuildContext context) { - var abpmdlFile = context.FindFile(_solutionFilePath.RemovePostFix(".sln") + ".abpmdl"); + var abpmdlFile = context.FindFile(_solutionFilePathWithoutFileExtension + ".abpmdl"); if (abpmdlFile == null) { @@ -106,11 +177,14 @@ private string FindProjectKey(List solutionFileLines) private void SetSolutionAndProjectPathsIfNull(ProjectBuildContext context) { - if (_solutionFilePath == null) + if (_solutionFilePathWithoutFileExtension == null) { - _solutionFilePath = context.FindFile("/aspnet-core/MyCompanyName.MyProjectName.sln")?.Name ?? - context.FindFile("/MyCompanyName.MyProjectName.sln")?.Name ?? - context.FindFile("/MyCompanyName.MyProjectName.MicroserviceName.sln")?.Name; + _solutionFilePathWithoutFileExtension = context.FindFile("/aspnet-core/MyCompanyName.MyProjectName.sln")?.Name.RemovePostFix(".sln") ?? + context.FindFile("/aspnet-core/MyCompanyName.MyProjectName.slnx")?.Name.RemovePostFix(".slnx") ?? + context.FindFile("/MyCompanyName.MyProjectName.sln")?.Name.RemovePostFix(".sln") ?? + context.FindFile("/MyCompanyName.MyProjectName.slnx")?.Name.RemovePostFix(".slnx") ?? + context.FindFile("/MyCompanyName.MyProjectName.MicroserviceName.sln")?.Name.RemovePostFix(".sln") ?? + context.FindFile("/MyCompanyName.MyProjectName.MicroserviceName.slnx")?.Name.RemovePostFix(".slnx"); } if (_projectFolderPath == null) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MicroserviceServiceStringEncryptionStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MicroserviceServiceStringEncryptionStep.cs index 7e25cb2b96c..9ae8e14a8db 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MicroserviceServiceStringEncryptionStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MicroserviceServiceStringEncryptionStep.cs @@ -17,7 +17,8 @@ protected virtual string FindDefaultPassPhrase(ProjectBuildContext context) var directoryInfo = new DirectoryInfo(context.BuildArgs.OutputFolder); do { - var msSolution = Directory.GetFiles(directoryInfo.FullName, "*.sln", SearchOption.TopDirectoryOnly).FirstOrDefault(); + var msSolution = Directory.GetFiles(directoryInfo.FullName, "*.sln", SearchOption.TopDirectoryOnly) + .Concat(Directory.GetFiles(directoryInfo.FullName, "*.slnx", SearchOption.TopDirectoryOnly)).FirstOrDefault(); if (msSolution != null) { var appSettings = Directory.GetFiles(Path.Combine(directoryInfo.FullName, "apps", "auth-server"), diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/PackagePreviewSwitcher.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/PackagePreviewSwitcher.cs index 7cf1d0da7ac..13046dae785 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/PackagePreviewSwitcher.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/PackagePreviewSwitcher.cs @@ -269,7 +269,8 @@ await _npmPackagesUpdater.Update( private List GetSolutionPaths(CommandLineArgs commandLineArgs) { - return Directory.GetFiles(GetDirectory(commandLineArgs), "*.sln", SearchOption.AllDirectories).ToList(); + return Directory.GetFiles(GetDirectory(commandLineArgs), "*.sln", SearchOption.AllDirectories) + .Concat(Directory.GetFiles(GetDirectory(commandLineArgs), "*.slnx", SearchOption.AllDirectories)).ToList(); } private List GetProjectPaths(CommandLineArgs commandLineArgs) @@ -317,7 +318,8 @@ private string FindSolutionFolder(string projectFile) return Path.GetDirectoryName(projectFile); } - if (Directory.GetFiles(targetFolder, "*.sln", SearchOption.TopDirectoryOnly).Any()) + if (Directory.GetFiles(targetFolder, "*.sln", SearchOption.TopDirectoryOnly) + .Concat(Directory.GetFiles(targetFolder, "*.slnx", SearchOption.TopDirectoryOnly)).Any()) { break; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs index 9d9d7e159e9..f118892b5ae 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs @@ -214,7 +214,8 @@ protected virtual string FindSolutionFile(string projectFile) { var folder = FindSolutionFolder(projectFile); - return Directory.GetFiles(folder, "*.sln", SearchOption.TopDirectoryOnly).FirstOrDefault(); + return Directory.GetFiles(folder, "*.sln", SearchOption.TopDirectoryOnly) + .Concat(Directory.GetFiles(folder, "*.slnx", SearchOption.TopDirectoryOnly)).FirstOrDefault(); } protected virtual string FindSolutionFolder(string projectFile) @@ -232,7 +233,8 @@ protected virtual string FindSolutionFolder(string projectFile) return Path.GetDirectoryName(projectFile); } - if (Directory.GetFiles(targetFolder, "*.sln", SearchOption.TopDirectoryOnly).Any()) + if (Directory.GetFiles(targetFolder, "*.sln", SearchOption.TopDirectoryOnly) + .Concat(Directory.GetFiles(targetFolder, "*.slnx", SearchOption.TopDirectoryOnly)).Any()) { break; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionFileModifier.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionFileModifier.cs index b1678eaca97..7a815df81d1 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionFileModifier.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionFileModifier.cs @@ -4,34 +4,31 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Xml; +using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli.ProjectModification; public class SolutionFileModifier : ITransientDependency { - public static Encoding DefaultEncoding = Encoding.UTF8; + private readonly ICmdHelper _cmdHelper; + public SolutionFileModifier(ICmdHelper cmdHelper) + { + _cmdHelper = cmdHelper; + } + public async Task RemoveProjectFromSolutionFileAsync(string solutionFile, string projectName) { - using (var fileStream = File.Open(solutionFile, FileMode.Open, FileAccess.ReadWrite, FileShare.None)) + var list = _cmdHelper.RunCmdAndGetOutput($"dotnet sln \"{solutionFile}\" list"); + + foreach (var line in list.Split(new[] { Environment.NewLine, "\n" }, StringSplitOptions.None)) { - using (var sr = new StreamReader(fileStream, Encoding.Default, true)) + if (Path.GetFileNameWithoutExtension(line.Trim()).Equals(projectName, StringComparison.InvariantCultureIgnoreCase)) { - var solutionFileContent = await sr.ReadToEndAsync(); - solutionFileContent.NormalizeLineEndings(); - - var lines = solutionFileContent.Split(new[] { Environment.NewLine, "\n" }, StringSplitOptions.None); - var updatedContent = RemoveProject(lines.ToList(), projectName).JoinAsString(Environment.NewLine); - - fileStream.Seek(0, SeekOrigin.Begin); - fileStream.SetLength(0); - - using (var sw = new StreamWriter(fileStream, DefaultEncoding)) - { - await sw.WriteAsync(updatedContent); - await sw.FlushAsync(); - } + _cmdHelper.RunCmd($"dotnet sln \"{solutionFile}\" remove \"{line.Trim()}\""); + break; } } } @@ -48,105 +45,16 @@ public async Task AddPackageToSolutionFileAsync(NugetPackageInfo package, string private async Task AddPackageAsync(NugetPackageInfo package, string solutionFile) { - var srcFolderId = await AddNewFolderAndGetIdOrGetExistingIdAsync(solutionFile, "src"); - - var solutionFileContent = File.ReadAllText(solutionFile); - var lines = solutionFileContent.Split(new[] { Environment.NewLine, "\n" }, StringSplitOptions.None).ToList(); - - if (lines.Any(l => l.Contains($"\"{package.Name}\""))) - { - return; - } - - var projectGuid = Guid.NewGuid().ToString(); - - var newProjectLine = "Project(\"{9A19103F-16F7-4668-BE54-9A1E7A4F7556}\") = \"" + package.Name + "\"," + - " \"packages\\" + package.Name + "\\" + - "\\" + package.Name + ".csproj\", \"{" + projectGuid + "}\"" - + Environment.NewLine + "EndProject"; - - lines.InsertAfter(l => l.Trim().Equals("EndProject"), newProjectLine); - - var newPostSolutionLine = - " {" + projectGuid + "}.Debug|Any CPU.ActiveCfg = Debug|Any CPU" + Environment.NewLine + - " {" + projectGuid + "}.Debug|Any CPU.Build.0 = Debug|Any CPU" + Environment.NewLine + - " {" + projectGuid + "}.Release|Any CPU.ActiveCfg = Release|Any CPU" + Environment.NewLine + - " {" + projectGuid + "}.Release|Any CPU.Build.0 = Release|Any CPU"; - - lines.InsertAfter(l => l.Contains("GlobalSection") && l.Contains("ProjectConfigurationPlatforms"), - newPostSolutionLine); - - var newPreSolutionLine = - " {" + projectGuid + "} = {" + srcFolderId + "}"; - - lines.InsertAfter(l => l.Contains("GlobalSection") && l.Contains("NestedProjects"), newPreSolutionLine); - - File.WriteAllText(solutionFile, string.Join(Environment.NewLine, lines), DefaultEncoding); - } - - private List RemoveProject(List solutionFileLines, string projectName) - { - var projectKey = FindProjectKey(solutionFileLines, projectName); - - if (projectKey == null) - { - return solutionFileLines; - } - - var newSolutionFileLines = new List(); - var firstOccurence = true; - - for (var i = 0; i < solutionFileLines.Count; ++i) - { - if (solutionFileLines[i].Contains(projectKey)) - { - if (firstOccurence) - { - firstOccurence = false; - ++i; //Skip "EndProject" line too. - } - - continue; - } - - newSolutionFileLines.Add(solutionFileLines[i]); - } - - return newSolutionFileLines; - } - - private string FindProjectKey(List solutionFileLines, string projectName) - { - var projectNameWithQuotes = $"\"{projectName}\""; - foreach (var solutionFileLine in solutionFileLines) - { - if (solutionFileLine.Contains(projectNameWithQuotes)) - { - var curlyBracketStartIndex = solutionFileLine.LastIndexOf("{", StringComparison.OrdinalIgnoreCase); - var curlyBracketEndIndex = solutionFileLine.LastIndexOf("}", StringComparison.OrdinalIgnoreCase); - return solutionFileLine.Substring(curlyBracketStartIndex + 1, - curlyBracketEndIndex - curlyBracketStartIndex - 1); - } - } - - return null; + _cmdHelper.RunCmd($"dotnet sln \"{solutionFile}\" add \"packages\\{package.Name}\\{package.Name}.csproj\" --solution-folder src"); } private async Task AddModuleAsync(ModuleWithMastersInfo module, string solutionFile) { - var srcModuleFolderId = await AddNewFolderAndGetIdOrGetExistingIdAsync(solutionFile, module.Name, - await AddNewFolderAndGetIdOrGetExistingIdAsync(solutionFile, "modules")); - var testModuleFolderId = await AddNewFolderAndGetIdOrGetExistingIdAsync(solutionFile, module.Name + ".Tests", - await AddNewFolderAndGetIdOrGetExistingIdAsync(solutionFile, "test")); - - var file = File.ReadAllText(solutionFile); - var lines = file.Split(new[] { Environment.NewLine, "\n" }, StringSplitOptions.None).ToList(); - var projectsUnderModule = Directory.GetFiles( Path.Combine(Path.GetDirectoryName(solutionFile), "modules", module.Name), "*.csproj", SearchOption.AllDirectories); - + var projectsUnderTest = new List(); if (Directory.Exists(Path.Combine(Path.GetDirectoryName(solutionFile), "modules", module.Name, "test"))) { @@ -158,41 +66,14 @@ private async Task AddModuleAsync(ModuleWithMastersInfo module, string solutionF foreach (var projectPath in projectsUnderModule) { - var parentFolderId = projectsUnderTest.Contains(projectPath) ? testModuleFolderId : srcModuleFolderId; - var projectId = Path.GetFileName(projectPath).Replace(".csproj", ""); - var projectParentFolderInModule = projectsUnderTest.Contains(projectPath) ? "test" : "src"; - - if (lines.Any(l => l.Contains($"\"{projectId}\""))) - { - continue; - } - - var projectGuid = Guid.NewGuid().ToString(); - - var newProjectLine = "Project(\"{9A19103F-16F7-4668-BE54-9A1E7A4F7556}\") = \"" + projectId + "\"," + - " \"modules\\" + module.Name + "\\" + projectParentFolderInModule + "\\" + - projectId + "\\" + projectId + ".csproj\", \"{" + projectGuid + "}\"" - + Environment.NewLine + "EndProject"; - - lines.InsertAfter(l => l.Trim().Equals("EndProject"), newProjectLine); + var folder = projectsUnderTest.Contains(projectPath) ? "test" : "src"; - var newPostSolutionLine = - " {" + projectGuid + "}.Debug|Any CPU.ActiveCfg = Debug|Any CPU" + Environment.NewLine + - " {" + projectGuid + "}.Debug|Any CPU.Build.0 = Debug|Any CPU" + Environment.NewLine + - " {" + projectGuid + "}.Release|Any CPU.ActiveCfg = Release|Any CPU" + Environment.NewLine + - " {" + projectGuid + "}.Release|Any CPU.Build.0 = Release|Any CPU"; - - lines.InsertAfter(l => l.Contains("GlobalSection") && l.Contains("ProjectConfigurationPlatforms"), - newPostSolutionLine); - - var newPreSolutionLine = - " {" + projectGuid + "} = {" + parentFolderId + "}"; - - lines.InsertAfter(l => l.Contains("GlobalSection") && l.Contains("NestedProjects"), newPreSolutionLine); + var projectId = Path.GetFileName(projectPath).Replace(".csproj", ""); + var package = @$"modules\{module.Name}\{folder}\{projectId}\{projectId}.csproj"; + + _cmdHelper.RunCmd($"dotnet sln \"{solutionFile}\" add \"{package}\" --solution-folder {folder}"); } - - File.WriteAllText(solutionFile, string.Join(Environment.NewLine, lines), Encoding.UTF8); - + if (module.MasterModuleInfos != null) { foreach (var masterModule in module.MasterModuleInfos) @@ -201,43 +82,4 @@ private async Task AddModuleAsync(ModuleWithMastersInfo module, string solutionF } } } - - private async Task AddNewFolderAndGetIdOrGetExistingIdAsync(string solutionFile, string folderName, - string parentFolderId = null) - { - var file = File.ReadAllText(solutionFile); - var lines = file.Split(new[] { Environment.NewLine, "\n" }, StringSplitOptions.None).ToList(); - string folderId; - - var folderLineIndex = lines.FindIndex(l => - l.Contains("2150E333-8FDC-42A3-9474-1A3956D46DE8") && l.Contains("\"" + folderName + "\"")); - - if (folderLineIndex < 0) - { - folderId = Guid.NewGuid().ToString(); - var newFolderLine = "Project(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\") = \"" + folderName + "\", \"" + - folderName + "\", \"{" + folderId + "}\"" - + Environment.NewLine + "EndProject"; - - lines.InsertAfter(l => l.Trim().Equals("EndProject"), newFolderLine); - - if (parentFolderId != null) - { - var newPreSolutionLine = - " {" + folderId + "} = {" + parentFolderId + "}"; - - lines.InsertAfter(l => l.Contains("GlobalSection") && l.Contains("NestedProjects"), - newPreSolutionLine); - } - } - else - { - folderId = lines[folderLineIndex].Replace("\"", " ").Replace("{", " ").Replace("}", " ").TrimEnd() - .Split(" ").Last(); - } - - File.WriteAllText(solutionFile, string.Join(Environment.NewLine, lines), Encoding.UTF8); - - return folderId; - } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index 8a703a8deb8..cf2abe38577 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -335,7 +335,8 @@ private async Task RemoveUnnecessaryProjectsAsync(string solutionDirectory, Modu { var projectsToRemove = new List(); var moduleDirectory = Path.Combine(solutionDirectory, "modules", module.Name); - var moduleSolutionFile = Directory.GetFiles(moduleDirectory, "*.sln", SearchOption.TopDirectoryOnly).First(); + var moduleSolutionFile = Directory.GetFiles(moduleDirectory, "*.sln", SearchOption.TopDirectoryOnly) + .Concat(Directory.GetFiles(moduleDirectory, "*.slnx", SearchOption.TopDirectoryOnly)).First(); var isProjectTiered = await IsProjectTiered(projectFiles); var webPackagesWillBeAddedToBlazorServerProject = false; @@ -609,7 +610,8 @@ private async Task CreateNewModuleAsync(ModuleWithMastersInfo module, string mod private async Task DeleteRedundantHostProjects(string targetModuleFolder, string folderName) { - var moduleSolutionFile = Directory.GetFiles(targetModuleFolder, "*.sln", SearchOption.TopDirectoryOnly).First(); + var moduleSolutionFile = Directory.GetFiles(targetModuleFolder, "*.sln", SearchOption.TopDirectoryOnly) + .Concat(Directory.GetFiles(targetModuleFolder, "*.slnx", SearchOption.TopDirectoryOnly)).First(); var folder = Path.Combine(targetModuleFolder, folderName); if (Directory.Exists(folder))