Fixing CA1507 (#10186)

Author: himgoyalmicro

src/Microsoft.DotNet.Wpf/src/.editorconfig

@@ -44,9 +44,6 @@ dotnet_diagnostic.CA1310.severity = suggestion
 # CA1419: Provide a parameterless constructor that is as visible as the containing type for concrete types derived from 'System.Runtime.InteropServices.SafeHandle'
 dotnet_diagnostic.CA1419.severity = suggestion
 
-# CA1507: Use nameof in place of string
-dotnet_diagnostic.CA1507.severity = suggestion
-
 # CA1510: Use ArgumentNullException throw helper
 dotnet_diagnostic.CA1510.severity = suggestion
 

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/EventMap.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -108,7 +108,7 @@ private static AutomationEvent GetRegisteredEventObjectHelper(AutomationEvents e
                 case AutomationEvents.ActiveTextPositionChanged:                            eventObject = AutomationElementIdentifiers.ActiveTextPositionChangedEvent; break;
 
                 default:
-                    throw new ArgumentException(SR.Automation_InvalidEventId, "eventId");
+                    throw new ArgumentException(SR.Automation_InvalidEventId, nameof(eventId));
             }
 
             if ((eventObject != null) && (!_eventsTable.ContainsKey(eventObject.Id)))

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontCacheUtil.cs

@@ -493,7 +493,7 @@ internal static void SplitFontFaceIndex(Uri fontUri, out Uri fontSourceUri, out
                         out faceIndex
                     ))
                 {
-                    throw new ArgumentException(SR.FaceIndexMustBePositiveOrZero, "fontUri");
+                    throw new ArgumentException(SR.FaceIndexMustBePositiveOrZero, nameof(fontUri));
                 }
 
                 // face index was specified in a fragment, we need to strip off fragment from the source Uri

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/CompositeFontInfo.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -305,7 +305,7 @@ internal double Baseline
             get { return _baseline; }
             set 
             {
-                CompositeFontParser.VerifyNonNegativeMultiplierOfEm("Baseline", ref value);
+                CompositeFontParser.VerifyNonNegativeMultiplierOfEm(nameof(Baseline), ref value);
                 _baseline = value;
             }
         }
@@ -319,7 +319,7 @@ internal double LineSpacing
             get { return _lineSpacing; }
             set
             {
-                CompositeFontParser.VerifyPositiveMultiplierOfEm("LineSpacing", ref value);
+                CompositeFontParser.VerifyPositiveMultiplierOfEm(nameof(LineSpacing), ref value);
                 _lineSpacing = value;
             }
         }

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/FontDriver.cs

@@ -156,7 +156,7 @@ internal void SetFace(int faceIndex)
             else
             {
                 if (faceIndex != 0)
-                    throw new ArgumentOutOfRangeException("faceIndex", SR.FaceIndexValidOnlyForTTC);
+                    throw new ArgumentOutOfRangeException(nameof(faceIndex), SR.FaceIndexValidOnlyForTTC);
             }
 
             try

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IListConverters.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -53,7 +53,7 @@ public override object ConvertFrom(ITypeDescriptorContext td, CultureInfo ci, ob
 
             if (null == s)
             {
-                throw new ArgumentException(SR.Format(SR.General_BadType, "ConvertFrom"), "value");
+                throw new ArgumentException(SR.Format(SR.General_BadType, "ConvertFrom"), nameof(value));
             }
 
             return ConvertFromCore(td, ci, s);            

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/ByteRangeDownloader.cs

@@ -55,7 +55,7 @@ internal ByteRangeDownloader(Uri requestedUri, string tempFileName, SafeWaitHand
 
             if (tempFileName.Length <= 0)
             {
-                throw new ArgumentException(SR.InvalidTempFileName, "tempFileName");
+                throw new ArgumentException(SR.InvalidTempFileName, nameof(tempFileName));
             }
 
             _tempFileStream = File.Open(tempFileName, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite);
@@ -402,14 +402,14 @@ private ByteRangeDownloader(Uri requestedUri, SafeWaitHandle eventHandle)
             // Ensure uri is correct scheme (http or https) Do case-sensitive comparison since Uri.Scheme contract is to return in lower case only.
             if (!string.Equals(requestedUri.Scheme, Uri.UriSchemeHttp, StringComparison.Ordinal) && !string.Equals(requestedUri.Scheme, Uri.UriSchemeHttps, StringComparison.Ordinal))
             {
-                throw new ArgumentException(SR.InvalidScheme, "requestedUri");
+                throw new ArgumentException(SR.InvalidScheme, nameof(requestedUri));
             }
 
             ArgumentNullException.ThrowIfNull(eventHandle);
 
             if (eventHandle.IsInvalid || eventHandle.IsClosed)
             {
-                throw new ArgumentException(SR.InvalidEventHandle, "eventHandle");
+                throw new ArgumentException(SR.InvalidEventHandle, nameof(eventHandle));
             }
 
             _requestedUri = requestedUri;

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/NetStream.cs

@@ -139,7 +139,7 @@ public override int Read(byte[] buffer, int offset, int count)
             checked
             {
                 if (offset + count > buffer.Length)
-                    throw new ArgumentException(SR.IOBufferOverflow, "buffer");
+                    throw new ArgumentException(SR.IOBufferOverflow, nameof(buffer));
 
                 // make sure some data is in the stream - block until it is
                 int bytesAvailable = GetData(new Block(_position, count));
@@ -248,7 +248,7 @@ public override long Seek(long offset, SeekOrigin origin)
 
                     default:
                         {
-                            throw new ArgumentOutOfRangeException("origin", SR.SeekOriginInvalid);
+                            throw new ArgumentOutOfRangeException(nameof(origin), SR.SeekOriginInvalid);
                         }
                 }
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/PreloadedPackages.cs

@@ -152,7 +152,7 @@ private static void ValidateUriKey(Uri uri)
 
             if (!uri.IsAbsoluteUri)
             {
-                throw new ArgumentException(SR.UriMustBeAbsolute, "uri");
+                throw new ArgumentException(SR.UriMustBeAbsolute, nameof(uri));
             }
         }
 

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/ExtendedPropertyCollection.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -148,7 +148,7 @@ internal void Add(Guid id, object value)
         {
             if (this.Contains(id))
             {
-                throw new ArgumentException(SR.EPExists, "id");
+                throw new ArgumentException(SR.EPExists, nameof(id));
             }
 
             ExtendedProperty extendedProperty = new ExtendedProperty(id, value);
@@ -166,7 +166,7 @@ internal void Remove(Guid id)
         {
             if (!Contains(id))
             {
-                throw new ArgumentException(SR.EPGuidNotFound, "id");
+                throw new ArgumentException(SR.EPGuidNotFound, nameof(id));
             }
 
             ExtendedProperty propertyToRemove = GetExtendedPropertyById(id);
@@ -226,7 +226,7 @@ internal object this[Guid attributeId]
                 ExtendedProperty ep = GetExtendedPropertyById(attributeId);
                 if (ep == null)
                 {
-                    throw new ArgumentException(SR.EPNotFound, "attributeId");
+                    throw new ArgumentException(SR.EPNotFound, nameof(attributeId));
                 }
                 return ep.Value;
             }