1 files changed, 15 insertions, 14 deletions
diff --git a/src/mscorlib/src/System/Globalization/StringInfo.cs b/src/mscorlib/src/System/Globalization/StringInfo.cs
index b1151bde4f..d86e11592e 100644
--- a/src/mscorlib/src/System/Globalization/StringInfo.cs
+++ b/src/mscorlib/src/System/Globalization/StringInfo.cs
@@ -17,6 +17,7 @@ namespace System.Globalization {
     using System;
     using System.Runtime.Serialization;
     using System.Security.Permissions;
+    using System.Diagnostics;
     using System.Diagnostics.Contracts;
 
     [Serializable]
@@ -92,7 +93,7 @@ namespace System.Globalization {
             }
             set {
                 if (null == value) {
-                    throw new ArgumentNullException("String",
+                    throw new ArgumentNullException(nameof(String),
                         Environment.GetResourceString("ArgumentNull_String"));
                 }
                 Contract.EndContractBlock();
@@ -118,11 +119,11 @@ namespace System.Globalization {
             if(null == this.Indexes) {
                 // Just decide which error to give depending on the param they gave us....
                 if(startingTextElement < 0) {
-                    throw new ArgumentOutOfRangeException("startingTextElement",
+                    throw new ArgumentOutOfRangeException(nameof(startingTextElement),
                         Environment.GetResourceString("ArgumentOutOfRange_NeedPosNum"));
                 }
                 else {
-                    throw new ArgumentOutOfRangeException("startingTextElement",
+                    throw new ArgumentOutOfRangeException(nameof(startingTextElement),
                         Environment.GetResourceString("Arg_ArgumentOutOfRangeException"));
                 }
             }
@@ -135,22 +136,22 @@ namespace System.Globalization {
             // Parameter checking
             //
             if(startingTextElement < 0) {
-                throw new ArgumentOutOfRangeException("startingTextElement",
+                throw new ArgumentOutOfRangeException(nameof(startingTextElement),
                     Environment.GetResourceString("ArgumentOutOfRange_NeedPosNum"));
             }
 
             if(this.String.Length == 0 || startingTextElement >= this.Indexes.Length) {
-                throw new ArgumentOutOfRangeException("startingTextElement",
+                throw new ArgumentOutOfRangeException(nameof(startingTextElement),
                     Environment.GetResourceString("Arg_ArgumentOutOfRangeException"));
             }
 
             if(lengthInTextElements < 0) {
-                throw new ArgumentOutOfRangeException("lengthInTextElements",
+                throw new ArgumentOutOfRangeException(nameof(lengthInTextElements),
                     Environment.GetResourceString("ArgumentOutOfRange_NeedPosNum"));
             }
 
             if(startingTextElement > this.Indexes.Length - lengthInTextElements) {
-                throw new ArgumentOutOfRangeException("lengthInTextElements",
+                throw new ArgumentOutOfRangeException(nameof(lengthInTextElements),
                     Environment.GetResourceString("Arg_ArgumentOutOfRangeException"));
             }
 
@@ -206,8 +207,8 @@ namespace System.Globalization {
         
         internal static int GetCurrentTextElementLen(String str, int index, int len, ref UnicodeCategory ucCurrent, ref int currentCharCount)
         {
-            Contract.Assert(index >= 0 && len >= 0, "StringInfo.GetCurrentTextElementLen() : index = " + index + ", len = " + len);
-            Contract.Assert(index < len, "StringInfo.GetCurrentTextElementLen() : index = " + index + ", len = " + len);
+            Debug.Assert(index >= 0 && len >= 0, "StringInfo.GetCurrentTextElementLen() : index = " + index + ", len = " + len);
+            Debug.Assert(index < len, "StringInfo.GetCurrentTextElementLen() : index = " + index + ", len = " + len);
             if (index + currentCharCount == len)
             {
                 // This is the last character/surrogate in the string.
@@ -268,7 +269,7 @@ namespace System.Globalization {
             // Validate parameters.
             //
             if (str==null) {
-                throw new ArgumentNullException("str");
+                throw new ArgumentNullException(nameof(str));
             }
             Contract.EndContractBlock();
         
@@ -277,7 +278,7 @@ namespace System.Globalization {
                 if (index == len) {
                     return (String.Empty);
                 }            
-                throw new ArgumentOutOfRangeException("index", Environment.GetResourceString("ArgumentOutOfRange_Index"));
+                throw new ArgumentOutOfRangeException(nameof(index), Environment.GetResourceString("ArgumentOutOfRange_Index"));
             }
 
             int charLen;
@@ -297,14 +298,14 @@ namespace System.Globalization {
             //
             if (str==null) 
             {
-                throw new ArgumentNullException("str");
+                throw new ArgumentNullException(nameof(str));
             }
             Contract.EndContractBlock();
         
             int len = str.Length;
             if (index < 0 || (index > len))
             {
-                throw new ArgumentOutOfRangeException("index", Environment.GetResourceString("ArgumentOutOfRange_Index"));
+                throw new ArgumentOutOfRangeException(nameof(index), Environment.GetResourceString("ArgumentOutOfRange_Index"));
             }
 
             return (new TextElementEnumerator(str, index, len));
@@ -326,7 +327,7 @@ namespace System.Globalization {
         {
             if (str == null)
             {
-                throw new ArgumentNullException("str");
+                throw new ArgumentNullException(nameof(str));
             }
             Contract.EndContractBlock();