Fixed aspnetboilerplate#462. Also added some useful string extension methods.

Author: hikalkan

src/Abp/AbpConsts.cs

@@ -8,6 +8,6 @@ public static class AbpConsts
         /// <summary>
         /// Current version of the ABP.
         /// </summary>
-        public const string CurrentVersion = "0.5.12.1";
+        public const string CurrentVersion = "0.5.13.0";
     }
 }

src/Abp/Extensions/StringExtensions.cs

@@ -115,9 +115,6 @@ public static bool IsNullOrWhiteSpace(this string str)
         /// <summary>
         /// Gets a substring of a string from beginning of the string.
         /// </summary>
-        /// <param name="str"></param>
-        /// <param name="len"></param>
-        /// <returns></returns>
         /// <exception cref="ArgumentNullException">Thrown if <paramref name="str"/> is null</exception>
         /// <exception cref="ArgumentException">Thrown if <paramref name="len"/> is bigger that string's length</exception>
         public static string Left(this string str, int len)
@@ -135,6 +132,14 @@ public static string Left(this string str, int len)
             return str.Substring(0, len);
         }
 
+        /// <summary>
+        /// Converts line endings in the string to <see cref="Environment.NewLine"/>.
+        /// </summary>
+        public static string NormalizeLineEndings(this string str)
+        {
+            return str.Replace("\r\n", "\n").Replace("\r", "\n").Replace("\n", Environment.NewLine);
+        }
+
         /// <summary>
         /// Gets index of nth occurence of a char in a string.
         /// </summary>
@@ -168,9 +173,6 @@ public static int NthIndexOf(this string str, char c, int n)
         /// <summary>
         /// Gets a substring of a string from end of the string.
         /// </summary>
-        /// <param name="str"></param>
-        /// <param name="len"></param>
-        /// <returns></returns>
         /// <exception cref="ArgumentNullException">Thrown if <paramref name="str"/> is null</exception>
         /// <exception cref="ArgumentException">Thrown if <paramref name="len"/> is bigger that string's length</exception>
         public static string Right(this string str, int len)
@@ -188,6 +190,37 @@ public static string Right(this string str, int len)
             return str.Substring(str.Length - len, len);
         }
 
+        /// <summary>
+        /// Uses string.Split method to split given string by given separator.
+        /// </summary>
+        public static string[] Split(this string str, string separator)
+        {
+            return str.Split(new[] { separator }, StringSplitOptions.None);
+        }
+
+        /// <summary>
+        /// Uses string.Split method to split given string by given separator.
+        /// </summary>
+        public static string[] Split(this string str, string separator, StringSplitOptions options)
+        {
+            return str.Split(new[] { separator }, options);
+        }
+
+        /// <summary>
+        /// Uses string.Split method to split given string by <see cref="Environment.NewLine"/>.
+        /// </summary>
+        public static string[] SplitToLines(this string str)
+        {
+            return str.Split(Environment.NewLine);
+        }
+
+        /// <summary>
+        /// Uses string.Split method to split given string by <see cref="Environment.NewLine"/>.
+        /// </summary>
+        public static string[] SplitToLines(this string str, StringSplitOptions options)
+        {
+            return str.Split(Environment.NewLine, options);
+        }
 
         /// <summary>
         /// Converts PascalCase string to camelCase string.
@@ -333,7 +366,7 @@ public static string TruncateWithPostfix(this string str, int maxLength, string
             {
                 return string.Empty;
             }
-            
+
             if (str.Length <= maxLength)
             {
                 return str;

src/Abp/Localization/Dictionaries/Xml/XmlLocalizationDictionary.cs

@@ -84,7 +84,7 @@ public static XmlLocalizationDictionary BuildFomXmlString(string xmlString)
                         dublicateNames.Add(name);
                     }
 
-                    dictionary[name] = node.GetAttributeValueOrNull("value") ?? node.InnerText;
+                    dictionary[name] = (node.GetAttributeValueOrNull("value") ?? node.InnerText).NormalizeLineEndings();
                 }
             }
 

src/Tests/Abp.Tests/Extensions/StringExtensions_Tests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.Linq;
 using Abp.Extensions;
 using Shouldly;
 using Xunit;
@@ -79,6 +80,15 @@ public void Left_Test()
             str.Left(str.Length).ShouldBe(str);
         }
 
+        [Fact]
+        public void NormalizeLineEndings_Test()
+        {
+            const string str = "This\r\n is a\r test \n string";
+            var normalized = str.NormalizeLineEndings();
+            var lines = normalized.SplitToLines();
+            lines.Length.ShouldBe(4);
+        }
+
         [Fact]
         public void NthIndexOf_Test()
         {
@@ -121,7 +131,7 @@ public void TruncateWithPostFix_Test()
             str.TruncateWithPostfix(12, "~").ShouldBe("This is a t~");
             str.TruncateWithPostfix(0, "~").ShouldBe("");
             str.TruncateWithPostfix(100, "~").ShouldBe(str);
-            
+
             nullValue.TruncateWithPostfix(5, "~").ShouldBe(null);
         }