Enable CA1507: Use NameOf when possible (#355)

twsouthwick · web-flow · commit f802ecedb887 · 2017-12-27T13:44:04.000-08:00
diff --git a/DocumentFormat.OpenXml.Tests/Extensions/AttributeExtensions.cs b/DocumentFormat.OpenXml.Tests/Extensions/AttributeExtensions.cs
@@ -16,7 +16,7 @@ public static class AttributeExtensions
         public static XName GetXName(this OpenXmlAttribute attribute)
         {
             if (null == attribute)
-                throw new ArgumentNullException("attribute");
+                throw new ArgumentNullException(nameof(attribute));
 
             return XName.Get(attribute.LocalName, attribute.NamespaceUri);
         }
@@ -30,7 +30,7 @@ public static string GetFullName(this OpenXmlAttribute attribute)
         {
             if (null == attribute)
             {
-                throw new ArgumentNullException("attribute");
+                throw new ArgumentNullException(nameof(attribute));
             }
 
             if (string.IsNullOrEmpty(attribute.Prefix))
diff --git a/DocumentFormat.OpenXml.Tests/Extensions/OpenXmlElementExtensions.cs b/DocumentFormat.OpenXml.Tests/Extensions/OpenXmlElementExtensions.cs
@@ -31,7 +31,7 @@ public static OpenXmlElement SetEventHandler(this OpenXmlElement e, Func<OpenXml
         public static OpenXmlPartRootElement PartRootElement(this OpenXmlElement element)
         {
             if (null == element)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
 
             if (element is OpenXmlPartRootElement)
                 return element as OpenXmlPartRootElement;
@@ -47,7 +47,7 @@ public static OpenXmlPartRootElement PartRootElement(this OpenXmlElement element
         public static int Index(this OpenXmlElement element)
         {
             if (null == element)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
 
             if (element.Parent == null)   // root/orphan element itself
                 return 0;
@@ -63,7 +63,7 @@ public static int Index(this OpenXmlElement element)
         public static string Path(this OpenXmlElement element)
         {
             if (null == element)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
 
             var path = string.Format(@"/{0}@{1}", element.LocalName, element.Index());
 
@@ -78,7 +78,7 @@ public static string Path(this OpenXmlElement element)
         public static string GetFullName(this OpenXmlElement element)
         {
             if (null == element)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
 
             if (string.IsNullOrEmpty(element.Prefix))
                 return element.LocalName;
@@ -108,7 +108,7 @@ public static IEnumerable<OpenXmlAttribute> GetFixedAttributes(this OpenXmlEleme
         public static XName GetXName(this OpenXmlElement element)
         {
             if (null == element)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
 
             XNamespace xns = element.NamespaceUri;
             return xns + element.LocalName;
@@ -122,14 +122,14 @@ public static XName GetXName(this OpenXmlElement element)
         public static XElement ToXElement(this OpenXmlElement element)
         {
             if (element == null)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
             return XElement.Load(new StringReader(element.OuterXml));
         }
 
         public static OpenXmlElement SetIgnorable(this OpenXmlElement element, string prefix)
         {
             if (element == null)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
 
             var mc = element.MCAttributes;
             if (mc == null)
@@ -145,7 +145,7 @@ public static OpenXmlElement SetIgnorable(this OpenXmlElement element, string pr
         public static OpenXmlElement SetMustUnderstand(this OpenXmlElement element, string prefix)
         {
             if (element == null)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
 
             var mc = element.MCAttributes;
             if (mc == null)
@@ -161,7 +161,7 @@ public static OpenXmlElement SetMustUnderstand(this OpenXmlElement element, stri
         public static OpenXmlElement SetPreserveAttributes(this OpenXmlElement element, string qualified)
         {
             if (element == null)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
 
             var mc = element.MCAttributes;
             if (mc == null)
@@ -177,7 +177,7 @@ public static OpenXmlElement SetPreserveAttributes(this OpenXmlElement element,
         public static OpenXmlElement SetPreserveElements(this OpenXmlElement element, string qualified)
         {
             if (element == null)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
 
             var mc = element.MCAttributes;
             if (mc == null)
@@ -193,7 +193,7 @@ public static OpenXmlElement SetPreserveElements(this OpenXmlElement element, st
         public static OpenXmlElement SetProcessContent(this OpenXmlElement element, string qualified)
         {
             if (element == null)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
 
             var mc = element.MCAttributes;
             if (mc == null)
@@ -209,7 +209,7 @@ public static OpenXmlElement SetProcessContent(this OpenXmlElement element, stri
         public static AlternateContentChoice SetRequires(this AlternateContentChoice choice, string prefix)
         {
             if (choice == null)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(choice));
 
             if (choice.Requires == null)
                 choice.Requires = prefix;
diff --git a/DocumentFormat.OpenXml.Tests/Extensions/OpenXmlPartExtensions.cs b/DocumentFormat.OpenXml.Tests/Extensions/OpenXmlPartExtensions.cs
@@ -80,7 +80,7 @@ public static Boolean IsInkPart(this OpenXmlPart part)
         public static IEnumerable<OpenXmlPart> DescendantParts(this OpenXmlPartContainer root)
         {
             if (null == root)
-                throw new ArgumentNullException("root");
+                throw new ArgumentNullException(nameof(root));
 
             var parts = new List<OpenXmlPart>();
             var uriList = new List<string>();
@@ -123,7 +123,7 @@ private static void addChildIdPartPairs(IList<IdPartPair> list, OpenXmlPartConta
         public static bool IsReflectable(this OpenXmlPart part)
         {
             if (null == part)
-                throw new ArgumentNullException("part");
+                throw new ArgumentNullException(nameof(part));
 
             if (part.IsBibliographyPart() || part.IsAdditionalCharacteristicsPart() || part.IsInkPart())
             {
@@ -145,7 +145,7 @@ public static bool IsReflectable(this OpenXmlPart part)
         public static OpenXmlPartRootElement RootElement(this OpenXmlPart part)
         {
             if (null == part)
-                throw new ArgumentNullException("part");
+                throw new ArgumentNullException(nameof(part));
 
             if (part is CustomXmlPart)
             {
diff --git a/DocumentFormat.OpenXml.Tests/OpenXmlDomTest/OpenXmlDomTestBase.cs b/DocumentFormat.OpenXml.Tests/OpenXmlDomTest/OpenXmlDomTestBase.cs
@@ -58,7 +58,7 @@ private static String GetElementPath(OpenXmlElement element)
             // Log.Comment("get the current element position path");
             if (element == null)
             {
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
             }
 
             StringBuilder path = new StringBuilder();
@@ -105,9 +105,9 @@ private static void GetSameLevelPath(OpenXmlElement element, ref StringBuilder p
         private static XElement GetXmlElement(String path, OpenXmlPart part)
         {
             if (part == null)
-                throw new ArgumentNullException("part");
+                throw new ArgumentNullException(nameof(part));
             if (String.IsNullOrEmpty(path))
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
 
             XElement element = null;
             using (var stream = part.GetStream())
@@ -171,7 +171,7 @@ internal static XElement ConvertToXElement(OpenXmlPart part, OpenXmlElement elem
         internal XElement ToXElement(OpenXmlElement element)
         {
             if (element == null)
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
             return XElement.Load(new StringReader(element.OuterXml));
         }
 
@@ -1087,7 +1087,7 @@ private void RemoveChild(OpenXmlPart hostPart, GetTargetElement getHost, GetTarg
         internal OpenXmlElement RemoveOperation(OpenXmlElement target, int childPosition)
         {
             if (target == null)
-                throw new ArgumentNullException("target");
+                throw new ArgumentNullException(nameof(target));
 
             if (childPosition >= target.ChildElements.Count)
                 throw new IndexOutOfRangeException("targetPosition is out of range.");
@@ -2598,7 +2598,7 @@ internal void AnnotationCollection(OpenXmlPart hostPart, GetTargetElement getHos
         internal void VerifyNoChildren(XElement targetElement)
         {
             if (targetElement == null)
-                throw new ArgumentNullException("targetElement");
+                throw new ArgumentNullException(nameof(targetElement));
 
             Log.Comment("check if the current element has no children");
             Log.VerifyFalse(targetElement.HasElements, "Not all children are removed");
@@ -2719,7 +2719,7 @@ internal void VerifyRemove(XElement resultElement, XElement originalElement, IEn
             if (resultElement == null || originalElement == null)
                 throw new ArgumentNullException("resultElement|originalElement");
             if (childrenPosition == null)
-                throw new ArgumentNullException("childrenPosition");
+                throw new ArgumentNullException(nameof(childrenPosition));
 
             if (childrenPosition.Min() < 0 || childrenPosition.Max() >= originalElement.Elements().Count())
                 throw new IndexOutOfRangeException("Child position is out of range");
diff --git a/DocumentFormat.OpenXml.Tests/OpenXmlDomTest/PackageReflector.cs b/DocumentFormat.OpenXml.Tests/OpenXmlDomTest/PackageReflector.cs
@@ -148,7 +148,7 @@ public static OpenXmlPackage OpenExistingPackage(string filename)
         public static OpenXmlPackage CreatePackageOn(OpenXmlPackage srcPackage, string destDocument)
         {
             if (null == srcPackage)
-                throw new ArgumentNullException("srcPackage");
+                throw new ArgumentNullException(nameof(srcPackage));
 
             OpenXmlPackage destPackage = null;
             if (srcPackage is WordprocessingDocument)
@@ -388,7 +388,7 @@ internal void BuildPartRootElementMap()
         internal void ReflectPackage(OpenXmlPackage srcPackage, OpenXmlPackage destPackage)
         {
             if (null == srcPackage)
-                throw new ArgumentNullException("srcPackage");
+                throw new ArgumentNullException(nameof(srcPackage));
             if (null == destPackage)
                 throw new ArgumentNullException("destPackate");
 
diff --git a/DocumentFormat.OpenXml.Tests/OpenXmlDomTest/SimpleTypeTest.cs b/DocumentFormat.OpenXml.Tests/OpenXmlDomTest/SimpleTypeTest.cs
@@ -364,9 +364,9 @@ private bool isSequenceEqual<T1>(ICollection<T1> items, IEnumerable<T1> listB)
             where T1 : OpenXmlSimpleType, new()
         {
             if (items == null)
-                throw new ArgumentNullException("items");
+                throw new ArgumentNullException(nameof(items));
             if (listB == null)
-                throw new ArgumentNullException("listB");
+                throw new ArgumentNullException(nameof(listB));
             return items.Select(i => i.ToString()).SequenceEqual(listB.Select(t => t.ToString()));
         }
 
@@ -972,7 +972,7 @@ private void simpleTypeValueValidTest(OpenXmlSimpleType oxObj, bool expectedValu
             }
             else
             {
-                throw new ArgumentException("input is not an OnOffValue or a TrueFalseBlankValue!!!", "oxObj");
+                throw new ArgumentException("input is not an OnOffValue or a TrueFalseBlankValue!!!", nameof(oxObj));
             }
 
             string stringValue = oxObj.InnerText;
diff --git a/DocumentFormat.OpenXml/OpenXmlElement.cs b/DocumentFormat.OpenXml/OpenXmlElement.cs
@@ -141,7 +141,7 @@ protected OpenXmlElement(string outerXml)
             {
                 if (!ValidOuterXml(outerXml, this.NamespaceUri, this.LocalName))
                 {
-                    throw new ArgumentException(ExceptionMessages.InvalidOuterXml, "outerXml");
+                    throw new ArgumentException(ExceptionMessages.InvalidOuterXml, nameof(outerXml));
                 }
 
                 this.RawOuterXml = outerXml;
@@ -638,7 +638,7 @@ public OpenXmlAttribute GetAttribute(string localName, string namespaceUri)
 
             if (localName == string.Empty)
             {
-                throw new ArgumentOutOfRangeException("localName", ExceptionMessages.StringIsEmpty);
+                throw new ArgumentOutOfRangeException(nameof(localName), ExceptionMessages.StringIsEmpty);
             }
 
             if (this.HasAttributes)
@@ -764,7 +764,7 @@ public void SetAttribute(OpenXmlAttribute openXmlAttribute)
         {
             if (String.IsNullOrEmpty(openXmlAttribute.LocalName))
             {
-                throw new ArgumentOutOfRangeException("openXmlAttribute", ExceptionMessages.LocalNameIsNull);
+                throw new ArgumentOutOfRangeException(nameof(openXmlAttribute), ExceptionMessages.LocalNameIsNull);
             }
 
             if (openXmlAttribute.Prefix == OpenXmlElementContext.xmlnsPrefix)
@@ -829,7 +829,7 @@ public void RemoveAttribute(string localName, string namespaceUri)
 
             if (localName == string.Empty)
             {
-                throw new ArgumentOutOfRangeException("localName", ExceptionMessages.StringIsEmpty);
+                throw new ArgumentOutOfRangeException(nameof(localName), ExceptionMessages.StringIsEmpty);
             }
 
             if (this.HasAttributes)
diff --git a/DocumentFormat.OpenXml/OpenXmlUnknownElement.cs b/DocumentFormat.OpenXml/OpenXmlUnknownElement.cs
@@ -130,7 +130,7 @@ public static OpenXmlUnknownElement CreateOpenXmlUnknownElement(string outerXml)
 
                 // This method always expects an Element NodeType is passed, and there may be one or more preceding Whitespace NodeTypes before the Element.
                 // If it's not the case, then throw an exception.
-                throw new ArgumentException(ExceptionMessages.InvalidOuterXml, "outerXml");
+                throw new ArgumentException(ExceptionMessages.InvalidOuterXml, nameof(outerXml));
             }
         }
 
diff --git a/DocumentFormat.OpenXml/Packaging/ExtendedPart.cs b/DocumentFormat.OpenXml/Packaging/ExtendedPart.cs
@@ -161,7 +161,7 @@ internal override void InitPart<T>(T newPart, string contentType, string id)
 
             if (contentType == string.Empty)
             {
-                throw new ArgumentException(ExceptionMessages.StringArgumentEmptyException, "contentType");
+                throw new ArgumentException(ExceptionMessages.StringArgumentEmptyException, nameof(contentType));
             }
 
             newPart.CreateInternal(this.InternalOpenXmlPackage, this.ThisOpenXmlPart, contentType, null);
diff --git a/DocumentFormat.OpenXml/Packaging/OpenXmlBasePart.cs b/DocumentFormat.OpenXml/Packaging/OpenXmlBasePart.cs
@@ -763,7 +763,7 @@ internal void SetDomTree(OpenXmlPartRootElement partRootElement)
 
             if (partRootElement.OpenXmlPart != null)
             {
-                throw new ArgumentException(ExceptionMessages.PartRootAlreadyHasAssociation, "partRootElement");
+                throw new ArgumentException(ExceptionMessages.PartRootAlreadyHasAssociation, nameof(partRootElement));
             }
 
             partRootElement.OpenXmlPart = this;
diff --git a/DocumentFormat.OpenXml/Packaging/OpenXmlPartContainer.cs b/DocumentFormat.OpenXml/Packaging/OpenXmlPartContainer.cs
@@ -626,7 +626,7 @@ public string ChangeIdOfPart(OpenXmlPart part, string newRelationshipId)
             {
                 if (idPartPair.Key == newRelationshipId)
                 {
-                    throw new ArgumentException(ExceptionMessages.RelationshipIdConflict, "newRelationshipId");
+                    throw new ArgumentException(ExceptionMessages.RelationshipIdConflict, nameof(newRelationshipId));
                 }
 
                 if (idPartPair.Value == part)
@@ -1337,7 +1337,7 @@ internal T AddNewPartInternal<T>(string contentType, string id) where T : OpenXm
             {
                 if (id == string.Empty)
                 {
-                    throw new ArgumentException(ExceptionMessages.StringArgumentEmptyException, "id");
+                    throw new ArgumentException(ExceptionMessages.StringArgumentEmptyException, nameof(id));
                 }
 
                 try
@@ -1346,18 +1346,18 @@ internal T AddNewPartInternal<T>(string contentType, string id) where T : OpenXm
                 }
                 catch (XmlException)
                 {
-                    throw new ArgumentException(ExceptionMessages.InvalidXmlIDStringException, "id");
+                    throw new ArgumentException(ExceptionMessages.InvalidXmlIDStringException, nameof(id));
                 }
 
                 if (this.ChildrenParts.ContainsKey(id))
                 {
-                    throw new ArgumentException(ExceptionMessages.RelationshipIdConflict, "id");
+                    throw new ArgumentException(ExceptionMessages.RelationshipIdConflict, nameof(id));
                 }
             }
 
             if (contentType == string.Empty)
             {
-                throw new ArgumentException(ExceptionMessages.StringArgumentEmptyException, "contentType");
+                throw new ArgumentException(ExceptionMessages.StringArgumentEmptyException, nameof(contentType));
             }
 
             // use reflection to create the instance. As the default contructor of part is not "public"
@@ -1372,7 +1372,7 @@ internal T AddNewPartInternal<T>(string contentType, string id) where T : OpenXm
             {
                 // should we throw? or just ignore?
                 // throw new OpenXmlPackageException(ExceptionMessages.ErrorContentType);
-                throw new ArgumentOutOfRangeException("contentType", ExceptionMessages.ErrorContentType);
+                throw new ArgumentOutOfRangeException(nameof(contentType), ExceptionMessages.ErrorContentType);
             }
 
             if (contentType == null)
diff --git a/DocumentFormat.OpenXml/Packaging/PresentationDocument.cs b/DocumentFormat.OpenXml/Packaging/PresentationDocument.cs
@@ -260,7 +260,7 @@ public static PresentationDocument CreateFromTemplate(string path)
             // Check extensions as the template must have a valid Word Open XML extension.
             string extension = Path.GetExtension(path);
             if (extension != ".pptx" && extension != ".pptm" && extension != ".potx" && extension != ".potm")
-                throw new ArgumentException("Illegal template file: " + path, "path");
+                throw new ArgumentException("Illegal template file: " + path, nameof(path));
 
             using (PresentationDocument template = PresentationDocument.Open(path, false))
             {
diff --git a/DocumentFormat.OpenXml/Packaging/SpreadsheetDocument.cs b/DocumentFormat.OpenXml/Packaging/SpreadsheetDocument.cs
@@ -258,8 +258,11 @@ public static SpreadsheetDocument CreateFromTemplate(string path)
 
             // Check extensions as the template must have a valid Word Open XML extension.
             string extension = Path.GetExtension(path);
+
             if (extension != ".xlsx" && extension != ".xlsm" && extension != ".xltx" && extension != ".xltm")
-                throw new ArgumentException("Illegal template file: " + path, "path");
+            {
+                throw new ArgumentException($"Illegal template file: {path}", nameof(path));
+            }
 
             using (SpreadsheetDocument template = SpreadsheetDocument.Open(path, false))
             {
diff --git a/DocumentFormat.OpenXml/Packaging/WordprocessingDocument.cs b/DocumentFormat.OpenXml/Packaging/WordprocessingDocument.cs
@@ -281,8 +281,11 @@ public static WordprocessingDocument CreateFromTemplate(string path, bool isTemp
 
             // Check extensions as the template must have a valid Word Open XML extension.
             string extension = Path.GetExtension(path);
+
             if (extension != ".docx" && extension != ".docm" && extension != ".dotx" && extension != ".dotm")
-                throw new ArgumentException("Illegal template file: " + path, "path");
+            {
+                throw new ArgumentException($"Illegal template file: {path}", nameof(path));
+            }
 
             using (WordprocessingDocument template = WordprocessingDocument.Open(path, false))
             {
diff --git a/DocumentFormat.OpenXml/SimpleTypes/EnumValue.cs b/DocumentFormat.OpenXml/SimpleTypes/EnumValue.cs
diff --git a/DocumentFormat.OpenXml/Validation/OpenXmlValidator.cs b/DocumentFormat.OpenXml/Validation/OpenXmlValidator.cs
diff --git a/DocumentFormat.OpenXml/Validation/Schema/SchemaValidator.cs b/DocumentFormat.OpenXml/Validation/Schema/SchemaValidator.cs
diff --git a/rules.ruleset b/rules.ruleset

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public static class AttributeExtensions`
`16`	`16`	`public static XName GetXName(this OpenXmlAttribute attribute)`
`17`	`17`	`{`
`18`	`18`	`if (null == attribute)`
`19`		`- throw new ArgumentNullException("attribute");`
	`19`	`+ throw new ArgumentNullException(nameof(attribute));`
`20`	`20`
`21`	`21`	`return XName.Get(attribute.LocalName, attribute.NamespaceUri);`
`22`	`22`	`}`
`@@ -30,7 +30,7 @@ public static string GetFullName(this OpenXmlAttribute attribute)`
`30`	`30`	`{`
`31`	`31`	`if (null == attribute)`
`32`	`32`	`{`
`33`		`- throw new ArgumentNullException("attribute");`
	`33`	`+ throw new ArgumentNullException(nameof(attribute));`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`if (string.IsNullOrEmpty(attribute.Prefix))`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public static Boolean IsInkPart(this OpenXmlPart part)`
`80`	`80`	`public static IEnumerable<OpenXmlPart> DescendantParts(this OpenXmlPartContainer root)`
`81`	`81`	`{`
`82`	`82`	`if (null == root)`
`83`		`- throw new ArgumentNullException("root");`
	`83`	`+ throw new ArgumentNullException(nameof(root));`
`84`	`84`
`85`	`85`	`var parts = new List<OpenXmlPart>();`
`86`	`86`	`var uriList = new List<string>();`
`@@ -123,7 +123,7 @@ private static void addChildIdPartPairs(IList<IdPartPair> list, OpenXmlPartConta`
`123`	`123`	`public static bool IsReflectable(this OpenXmlPart part)`
`124`	`124`	`{`
`125`	`125`	`if (null == part)`
`126`		`- throw new ArgumentNullException("part");`
	`126`	`+ throw new ArgumentNullException(nameof(part));`
`127`	`127`
`128`	`128`	`if (part.IsBibliographyPart() \|\| part.IsAdditionalCharacteristicsPart() \|\| part.IsInkPart())`
`129`	`129`	`{`
`@@ -145,7 +145,7 @@ public static bool IsReflectable(this OpenXmlPart part)`
`145`	`145`	`public static OpenXmlPartRootElement RootElement(this OpenXmlPart part)`
`146`	`146`	`{`
`147`	`147`	`if (null == part)`
`148`		`- throw new ArgumentNullException("part");`
	`148`	`+ throw new ArgumentNullException(nameof(part));`
`149`	`149`
`150`	`150`	`if (part is CustomXmlPart)`
`151`	`151`	`{`
Original file line number	Diff line number	Diff line change
`@@ -364,9 +364,9 @@ private bool isSequenceEqual<T1>(ICollection<T1> items, IEnumerable<T1> listB)`
`364`	`364`	`where T1 : OpenXmlSimpleType, new()`
`365`	`365`	`{`
`366`	`366`	`if (items == null)`
`367`		`- throw new ArgumentNullException("items");`
	`367`	`+ throw new ArgumentNullException(nameof(items));`
`368`	`368`	`if (listB == null)`
`369`		`- throw new ArgumentNullException("listB");`
	`369`	`+ throw new ArgumentNullException(nameof(listB));`
`370`	`370`	`return items.Select(i => i.ToString()).SequenceEqual(listB.Select(t => t.ToString()));`
`371`	`371`	`}`
`372`	`372`
`@@ -972,7 +972,7 @@ private void simpleTypeValueValidTest(OpenXmlSimpleType oxObj, bool expectedValu`
`972`	`972`	`}`
`973`	`973`	`else`
`974`	`974`	`{`
`975`		`- throw new ArgumentException("input is not an OnOffValue or a TrueFalseBlankValue!!!", "oxObj");`
	`975`	`+ throw new ArgumentException("input is not an OnOffValue or a TrueFalseBlankValue!!!", nameof(oxObj));`
`976`	`976`	`}`
`977`	`977`
`978`	`978`	`string stringValue = oxObj.InnerText;`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ protected OpenXmlElement(string outerXml)`
`141`	`141`	`{`
`142`	`142`	`if (!ValidOuterXml(outerXml, this.NamespaceUri, this.LocalName))`
`143`	`143`	`{`
`144`		`- throw new ArgumentException(ExceptionMessages.InvalidOuterXml, "outerXml");`
	`144`	`+ throw new ArgumentException(ExceptionMessages.InvalidOuterXml, nameof(outerXml));`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`this.RawOuterXml = outerXml;`
`@@ -638,7 +638,7 @@ public OpenXmlAttribute GetAttribute(string localName, string namespaceUri)`
`638`	`638`
`639`	`639`	`if (localName == string.Empty)`
`640`	`640`	`{`
`641`		`- throw new ArgumentOutOfRangeException("localName", ExceptionMessages.StringIsEmpty);`
	`641`	`+ throw new ArgumentOutOfRangeException(nameof(localName), ExceptionMessages.StringIsEmpty);`
`642`	`642`	`}`
`643`	`643`
`644`	`644`	`if (this.HasAttributes)`
`@@ -764,7 +764,7 @@ public void SetAttribute(OpenXmlAttribute openXmlAttribute)`
`764`	`764`	`{`
`765`	`765`	`if (String.IsNullOrEmpty(openXmlAttribute.LocalName))`
`766`	`766`	`{`
`767`		`- throw new ArgumentOutOfRangeException("openXmlAttribute", ExceptionMessages.LocalNameIsNull);`
	`767`	`+ throw new ArgumentOutOfRangeException(nameof(openXmlAttribute), ExceptionMessages.LocalNameIsNull);`
`768`	`768`	`}`
`769`	`769`
`770`	`770`	`if (openXmlAttribute.Prefix == OpenXmlElementContext.xmlnsPrefix)`
`@@ -829,7 +829,7 @@ public void RemoveAttribute(string localName, string namespaceUri)`
`829`	`829`
`830`	`830`	`if (localName == string.Empty)`
`831`	`831`	`{`
`832`		`- throw new ArgumentOutOfRangeException("localName", ExceptionMessages.StringIsEmpty);`
	`832`	`+ throw new ArgumentOutOfRangeException(nameof(localName), ExceptionMessages.StringIsEmpty);`
`833`	`833`	`}`
`834`	`834`
`835`	`835`	`if (this.HasAttributes)`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public static OpenXmlUnknownElement CreateOpenXmlUnknownElement(string outerXml)`
`130`	`130`
`131`	`131`	`// This method always expects an Element NodeType is passed, and there may be one or more preceding Whitespace NodeTypes before the Element.`
`132`	`132`	`// If it's not the case, then throw an exception.`
`133`		`- throw new ArgumentException(ExceptionMessages.InvalidOuterXml, "outerXml");`
	`133`	`+ throw new ArgumentException(ExceptionMessages.InvalidOuterXml, nameof(outerXml));`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ internal override void InitPart<T>(T newPart, string contentType, string id)`
`161`	`161`
`162`	`162`	`if (contentType == string.Empty)`
`163`	`163`	`{`
`164`		`- throw new ArgumentException(ExceptionMessages.StringArgumentEmptyException, "contentType");`
	`164`	`+ throw new ArgumentException(ExceptionMessages.StringArgumentEmptyException, nameof(contentType));`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`newPart.CreateInternal(this.InternalOpenXmlPackage, this.ThisOpenXmlPart, contentType, null);`
Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,7 @@ internal void SetDomTree(OpenXmlPartRootElement partRootElement)`
`763`	`763`
`764`	`764`	`if (partRootElement.OpenXmlPart != null)`
`765`	`765`	`{`
`766`		`- throw new ArgumentException(ExceptionMessages.PartRootAlreadyHasAssociation, "partRootElement");`
	`766`	`+ throw new ArgumentException(ExceptionMessages.PartRootAlreadyHasAssociation, nameof(partRootElement));`
`767`	`767`	`}`
`768`	`768`
`769`	`769`	`partRootElement.OpenXmlPart = this;`