1 files changed, 16 insertions, 17 deletions

diff --git a/src/coreclr/tools/Common/CommandLine/ArgumentSyntax.cs b/src/coreclr/tools/Common/CommandLine/ArgumentSyntax.cs
index 4cea1200b3a..976f2a559b1 100644
--- a/src/coreclr/tools/Common/CommandLine/ArgumentSyntax.cs
+++ b/src/coreclr/tools/Common/CommandLine/ArgumentSyntax.cs
@@ -34,10 +34,10 @@ namespace Internal.CommandLine
         public static ArgumentSyntax Parse(IEnumerable<string> arguments, Action<ArgumentSyntax> defineAction)
         {
             if (arguments == null)
-                throw new ArgumentNullException("arguments");
+                throw new ArgumentNullException(nameof(arguments));
 
             if (defineAction == null)
-                throw new ArgumentNullException("defineAction");
+                throw new ArgumentNullException(nameof(defineAction));
 
             var syntax = new ArgumentSyntax(arguments);
             defineAction(syntax);
@@ -107,12 +107,12 @@ namespace Internal.CommandLine
         public ArgumentCommand<T> DefineCommand<T>(string name, T value)
         {
             if (string.IsNullOrEmpty(name))
-                throw new ArgumentException(Strings.NameMissing, "name");
+                throw new ArgumentException(Strings.NameMissing, nameof(name));
 
             if (!IsValidName(name))
             {
                 var message = string.Format(Strings.CommandNameIsNotValidFmt, name);
-                throw new ArgumentException(message, "name");
+                throw new ArgumentException(message, nameof(name));
             }
 
             if (_commands.Any(c => string.Equals(c.Name, name, StringComparison.Ordinal)))
@@ -143,7 +143,7 @@ namespace Internal.CommandLine
         public Argument<T> DefineOption<T>(string name, T defaultValue, Func<string, T> valueConverter, bool isRequired)
         {
             if (string.IsNullOrEmpty(name))
-                throw new ArgumentException(Strings.NameMissing, "name");
+                throw new ArgumentException(Strings.NameMissing, nameof(name));
 
             if (DefinedParameters.Any())
                 throw new InvalidOperationException(Strings.OptionsMustBeDefinedBeforeParameters);
@@ -178,7 +178,7 @@ namespace Internal.CommandLine
         public ArgumentList<T> DefineOptionList<T>(string name, IReadOnlyList<T> defaultValue, Func<string, T> valueConverter, bool isRequired)
         {
             if (string.IsNullOrEmpty(name))
-                throw new ArgumentException(Strings.NameMissing, "name");
+                throw new ArgumentException(Strings.NameMissing, nameof(name));
 
             if (DefinedParameters.Any())
                 throw new InvalidOperationException(Strings.OptionsMustBeDefinedBeforeParameters);
@@ -213,12 +213,12 @@ namespace Internal.CommandLine
         public Argument<T> DefineParameter<T>(string name, T defaultValue, Func<string, T> valueConverter)
         {
             if (string.IsNullOrEmpty(name))
-                throw new ArgumentException(Strings.NameMissing, "name");
+                throw new ArgumentException(Strings.NameMissing, nameof(name));
 
             if (!IsValidName(name))
             {
                 var message = string.Format(Strings.ParameterNameIsNotValidFmt, name);
-                throw new ArgumentException(message, "name");
+                throw new ArgumentException(message, nameof(name));
             }
 
             if (DefinedParameters.Any(p => p.IsList))
@@ -252,12 +252,12 @@ namespace Internal.CommandLine
         public ArgumentList<T> DefineParameterList<T>(string name, IReadOnlyList<T> defaultValue, Func<string, T> valueConverter)
         {
             if (string.IsNullOrEmpty(name))
-                throw new ArgumentException(Strings.NameMissing, "name");
+                throw new ArgumentException(Strings.NameMissing, nameof(name));
 
             if (!IsValidName(name))
             {
                 var message = string.Format(Strings.ParameterNameIsNotValidFmt, name);
-                throw new ArgumentException(message, "name");
+                throw new ArgumentException(message, nameof(name));
             }
 
             if (DefinedParameters.Any(p => p.IsList))
@@ -304,7 +304,7 @@ namespace Internal.CommandLine
                 if (!IsValidName(alias))
                 {
                     var message = string.Format(Strings.OptionNameIsNotValidFmt, alias);
-                    throw new ArgumentException(message, "name");
+                    throw new ArgumentException(message, nameof(name));
                 }
 
                 foreach (var option in DefinedOptions)
@@ -358,8 +358,7 @@ namespace Internal.CommandLine
         {
             get
             {
-                if (_parser == null)
-                    _parser = new ArgumentParser(_arguments, ParseResponseFile);
+                _parser ??= new ArgumentParser(_arguments, ParseResponseFile);
 
                 return _parser;
             }
@@ -457,15 +456,15 @@ namespace Internal.CommandLine
 
         public IReadOnlyList<string> ExtraHelpParagraphs
         {
+            get
+            {
+                return _extraHelpParagraphs.ToArray();
+            }
             set
             {
                 _extraHelpParagraphs.Clear();
                 _extraHelpParagraphs.AddRange(value);
             }
-            get
-            {
-                return _extraHelpParagraphs.ToArray();
-            }
         }
     }
 }