From: Stephen Toub <stoub@microsoft.com>
Date: Mon, 17 Jul 2023 20:52:57 +0000 (-0400)
Subject: Enable CA1863 (Use 'CompositeFormat') as suggestion (#89029)
X-Git-Tag: accepted/tizen/unified/riscv/20231226.055536~970
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=023b54a2d4a82c6b5996fc67f55b83138de64f08;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Enable CA1863 (Use 'CompositeFormat') as suggestion (#89029)

I ran it over runtime, and the only things flagged were for exceptional cases where it's not worth using.  Rather than a bunch of suppressions, I'm just enabling it as info-level.
---

diff --git a/eng/CodeAnalysis.src.globalconfig b/eng/CodeAnalysis.src.globalconfig
index 36a3ff9..de0d6e8 100644
--- a/eng/CodeAnalysis.src.globalconfig
+++ b/eng/CodeAnalysis.src.globalconfig
@@ -477,6 +477,9 @@ dotnet_diagnostic.CA1861.severity = warning
 # CA1862: Prefer using 'StringComparer'/'StringComparison' to perform case-insensitive string comparisons
 dotnet_diagnostic.CA1862.severity = warning
 
+# CA1863: Use 'CompositeFormat'
+dotnet_diagnostic.CA1863.severity = suggestion
+
 # CA1864: Prefer the 'IDictionary.TryAdd(TKey, TValue)' method
 dotnet_diagnostic.CA1864.severity = warning
 
diff --git a/eng/CodeAnalysis.test.globalconfig b/eng/CodeAnalysis.test.globalconfig
index d884d9f..3312010 100644
--- a/eng/CodeAnalysis.test.globalconfig
+++ b/eng/CodeAnalysis.test.globalconfig
@@ -474,6 +474,9 @@ dotnet_diagnostic.CA1861.severity = none
 # CA1862: Prefer using 'StringComparer'/'StringComparison' to perform case-insensitive string comparisons
 dotnet_diagnostic.CA1862.severity = none
 
+# CA1863: Use 'CompositeFormat'
+dotnet_diagnostic.CA1863.severity = none
+
 # CA1864: Prefer the 'IDictionary.TryAdd(TKey, TValue)' method
 dotnet_diagnostic.CA1864.severity = none
 
diff --git a/src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs
index b56d32a..959489b 100644
--- a/src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs
+++ b/src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs
@@ -1895,8 +1895,8 @@ namespace System
                 else if (!declaredType.IsAssignableFrom(reflectedType))
                 {
                     // declaredType is not Array, not generic, and not assignable from reflectedType
-                    throw new ArgumentException(string.Format(
-                        CultureInfo.CurrentCulture, SR.Argument_ResolveMethodHandle,
+                    throw new ArgumentException(SR.Format(
+                        SR.Argument_ResolveMethodHandle,
                         reflectedType.ToString(), declaredType.ToString()));
                 }
             }