Clean up code with NET8_0_OR_GREATER (#109507)

dotnet · Nov 7, 2024 · 70c574d · 70c574d
1 parent bad7318
commit 70c574d
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/src/libraries/System.Collections/src/System/Collections/Generic/OrderedDictionary.cs b/src/libraries/System.Collections/src/System/Collections/Generic/OrderedDictionary.cs
@@ -6,7 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-#if NET8_0_OR_GREATER
+#if NET
 using static System.ArgumentNullException;
 using static System.ArgumentOutOfRangeException;
 #else

diff --git a/src/libraries/System.Collections/src/System/Collections/ThrowHelper.cs b/src/libraries/System.Collections/src/System/Collections/ThrowHelper.cs
@@ -34,7 +34,7 @@ internal static void ThrowIndexArgumentOutOfRange() =>
         internal static void ThrowVersionCheckFailed() =>
             throw new InvalidOperationException(SR.InvalidOperation_EnumFailedVersion);
 
-#if !NET8_0_OR_GREATER
+#if !NET
         /// <summary>Throws an <see cref="ArgumentNullException"/> if <paramref name="argument"/> is null.</summary>
         /// <param name="argument">The reference type argument to validate as non-null.</param>
         /// <param name="paramName">The name of the parameter with which <paramref name="argument"/> corresponds.</param>

diff --git a/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateZLib/ZLibException.cs b/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateZLib/ZLibException.cs
@@ -53,20 +53,16 @@ public ZLibException(string? message, Exception? innerException) : base(message,
         /// </summary>
         /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
         /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
-#if NET8_0_OR_GREATER
         [Obsolete(Obsoletions.LegacyFormatterImplMessage, DiagnosticId = Obsoletions.LegacyFormatterImplDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
         [EditorBrowsable(EditorBrowsableState.Never)]
-#endif
         protected ZLibException(SerializationInfo info, StreamingContext context) : base(info, context)
         {
             _zlibErrorContext = info.GetString("zlibErrorContext");
             _zlibErrorCode = (ZLibNative.ErrorCode)info.GetInt32("zlibErrorCode");
             _zlibErrorMessage = info.GetString("zlibErrorMessage");
         }
 
-#if NET8_0_OR_GREATER
         [Obsolete(Obsoletions.LegacyFormatterImplMessage, DiagnosticId = Obsoletions.LegacyFormatterImplDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
-#endif
         void ISerializable.GetObjectData(SerializationInfo si, StreamingContext context)
         {
             base.GetObjectData(si, context);

diff --git a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/ICollectionDebugView.cs b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/ICollectionDebugView.cs
@@ -11,7 +11,7 @@ internal sealed class ICollectionDebugView<T>
 
         public ICollectionDebugView(ICollection<T> collection)
         {
-#if NET8_0_OR_GREATER
+#if NET
             ArgumentNullException.ThrowIfNull(collection);
 #else
             if (collection is null)

diff --git a/...aries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCharClass.cs b/...aries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCharClass.cs
@@ -1042,7 +1042,7 @@ public static bool ParticipatesInCaseConversion(ReadOnlySpan<char> s)
         /// <summary>Gets whether the specified span contains only ASCII.</summary>
         public static bool IsAscii(ReadOnlySpan<char> s)
         {
-#if NET8_0_OR_GREATER
+#if NET
             return Ascii.IsValid(s);
 #else
             foreach (char c in s)

diff --git a/...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs b/...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs
@@ -1938,7 +1938,7 @@ internal static int MapCaptureNumber(int capnum, Hashtable? caps) =>
                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, Q, S, 0, 0, 0
         ];
 
-#if NET8_0_OR_GREATER
+#if NET
         private static readonly SearchValues<char> s_metachars =
             SearchValues.Create("\t\n\f\r #$()*+.?[\\^{|");