From d62a5d56ff97593fd9ad3bdcca2bc53b63693356 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 26 Sep 2022 10:36:43 +0300 Subject: [PATCH] Cli: Fix line splitting in SolutionFileModifier --- .../Abp/Cli/ProjectModification/SolutionFileModifier.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 45e0684b4a..b1678eaca9 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 @@ -51,7 +51,7 @@ public class SolutionFileModifier : ITransientDependency var srcFolderId = await AddNewFolderAndGetIdOrGetExistingIdAsync(solutionFile, "src"); var solutionFileContent = File.ReadAllText(solutionFile); - var lines = solutionFileContent.Split(Environment.NewLine).ToList(); + var lines = solutionFileContent.Split(new[] { Environment.NewLine, "\n" }, StringSplitOptions.None).ToList(); if (lines.Any(l => l.Contains($"\"{package.Name}\""))) { @@ -140,7 +140,7 @@ public class SolutionFileModifier : ITransientDependency await AddNewFolderAndGetIdOrGetExistingIdAsync(solutionFile, "test")); var file = File.ReadAllText(solutionFile); - var lines = file.Split(Environment.NewLine).ToList(); + var lines = file.Split(new[] { Environment.NewLine, "\n" }, StringSplitOptions.None).ToList(); var projectsUnderModule = Directory.GetFiles( Path.Combine(Path.GetDirectoryName(solutionFile), "modules", module.Name), @@ -206,7 +206,7 @@ public class SolutionFileModifier : ITransientDependency string parentFolderId = null) { var file = File.ReadAllText(solutionFile); - var lines = file.Split(Environment.NewLine).ToList(); + var lines = file.Split(new[] { Environment.NewLine, "\n" }, StringSplitOptions.None).ToList(); string folderId; var folderLineIndex = lines.FindIndex(l =>