Fix IDE0057 warnings

Fix IDE0057 warnings identified in App-vNext#2003.
martincostello · Apr 12, 2024 · adf6515 · adf6515
1 parent 9ccc6c6
commit adf6515
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Polly.Core/Utils/TypeNameFormatter.cs b/src/Polly.Core/Utils/TypeNameFormatter.cs
@@ -17,6 +17,12 @@ public static string Format(Type type)
             return type.Name;
         }
 
-        return $"{type.Name.Substring(0, type.Name.Length - GenericSuffixLength)}<{Format(args[0])}>";
+#if NET6_0_OR_GREATER
+        var nameNoAirity = type.Name[..(type.Name.Length - GenericSuffixLength)];
+#else
+        var nameNoAirity = type.Name.Substring(0, type.Name.Length - GenericSuffixLength);
+#endif
+
+        return $"{nameNoAirity}<{Format(args[0])}>";
     }
 }
diff --git a/src/Polly/Utilities/KeyHelper.cs b/src/Polly/Utilities/KeyHelper.cs
@@ -6,5 +6,9 @@ internal static class KeyHelper
     private const int GuidPartLength = 8;
 
     public static string GuidPart() =>
+#if NET6_0_OR_GREATER
+        Guid.NewGuid().ToString()[..GuidPartLength];
+#else
         Guid.NewGuid().ToString().Substring(0, GuidPartLength);
+#endif
 }