Replace NET9_0_OR_GREATER and NET10_0_OR_GREATER in test files

Co-authored-by: stephentoub <[email protected]>

Author: Copilot

src/libraries/Common/tests/System/Security/Cryptography/ByteUtils.cs

@@ -24,7 +24,7 @@ internal static byte[] AsciiBytes(string s)
 
         internal static byte[] HexToByteArray(this string hexString)
         {
-#if NET9_0_OR_GREATER
+#if NET
             return Convert.FromHexString(hexString);
 #else
             byte[] bytes = new byte[hexString.Length / 2];
@@ -56,7 +56,7 @@ internal static string ByteArrayToHex(this ReadOnlyMemory<byte> bytes)
 
         internal static string ByteArrayToHex(this ReadOnlySpan<byte> bytes)
         {
-#if NET9_0_OR_GREATER
+#if NET
             return Convert.ToHexString(bytes);
 #else
             StringBuilder builder = new StringBuilder(bytes.Length * 2);
@@ -89,7 +89,7 @@ internal static byte[] RepeatByte(byte b, int count)
 
         internal static bool ContainsAnyExcept(this ReadOnlySpan<byte> bytes, byte value)
         {
-#if NET9_0_OR_GREATER
+#if NET
             return bytes.ContainsAnyExcept(value);
 #else
             foreach (byte b in bytes)

src/libraries/Common/tests/System/Security/Cryptography/X509Certificates/X509CertificateLoaderPkcs12CollectionTests.cs

@@ -749,7 +749,7 @@ public void LoadWithDuplicateAttributes(bool allowDuplicates)
         {
             Pkcs12LoaderLimits limits = Pkcs12LoaderLimits.Defaults;
 
-#if !NET10_0_OR_GREATER
+#if !NET
             if (allowDuplicates)
             {
                 limits = Pkcs12LoaderLimits.DangerousNoLimits;
@@ -759,7 +759,7 @@ public void LoadWithDuplicateAttributes(bool allowDuplicates)
             // remove the edit lock
             limits = new Pkcs12LoaderLimits(limits)
             {
-#if NET10_0_OR_GREATER
+#if NET
                 AllowDuplicateAttributes = allowDuplicates,
 #endif
                 PreserveCertificateAlias = false,

src/libraries/Common/tests/System/Security/Cryptography/X509Certificates/X509CertificateLoaderPkcs12Tests.cs

@@ -744,7 +744,7 @@ public void LoadWithDuplicateAttributes(bool allowDuplicates)
         {
             Pkcs12LoaderLimits limits = Pkcs12LoaderLimits.Defaults;
 
-#if !NET10_0_OR_GREATER
+#if !NET
             if (allowDuplicates)
             {
                 limits = Pkcs12LoaderLimits.DangerousNoLimits;
@@ -754,7 +754,7 @@ public void LoadWithDuplicateAttributes(bool allowDuplicates)
             // remove the edit lock
             limits = new Pkcs12LoaderLimits(limits)
             {
-#if NET10_0_OR_GREATER
+#if NET
                 AllowDuplicateAttributes = allowDuplicates,
 #endif
                 PreserveCertificateAlias = false,

src/libraries/Microsoft.Extensions.Caching.Memory/tests/AltLookupTests.cs

@@ -30,7 +30,7 @@ public void SimpleStringAccess()
             Assert.False(cache.TryGetValue(objKey, out result));
             Assert.Null(result);
 
-#if NET9_0_OR_GREATER
+#if NET
             Assert.False(cache.TryGetValue(stringSpanKey, out result));
             Assert.Null(result);
 
@@ -48,7 +48,7 @@ public void SimpleStringAccess()
             Assert.True(cache.TryGetValue(objKey, out result));
             Assert.Same(cachedValue, result);
 
-#if NET9_0_OR_GREATER
+#if NET
             Assert.True(cache.TryGetValue(stringSpanKey, out result));
             Assert.Same(cachedValue, result);
 
@@ -65,7 +65,7 @@ public void SimpleStringAccess()
             Assert.False(cache.TryGetValue(objKey, out result));
             Assert.Null(result);
 
-#if NET9_0_OR_GREATER
+#if NET
             Assert.False(cache.TryGetValue(stringSpanKey, out result));
             Assert.Null(result);
 

src/libraries/System.Formats.Asn1/tests/Writer/Asn1WriterTests.cs

@@ -16,7 +16,7 @@ internal static void Verify(AsnWriter writer, string expectedHex)
             Assert.Equal(expectedHex, encoded.ByteArrayToHex());
             Assert.Equal(expectedSize, encoded.Length);
 
-#if NET9_0_OR_GREATER
+#if NET
             string hexEncoded = writer.Encode(Convert.ToHexString);
             Assert.Equal(expectedHex, hexEncoded);
 

src/libraries/System.Formats.Asn1/tests/Writer/PushPopSetOf.cs

@@ -466,7 +466,7 @@ public static void CannotEncodeWhileUnbalanced(AsnEncodingRules ruleSet, bool cu
             Assert.Throws<InvalidOperationException>(() => writer.EncodedValueEquals(buf));
             Assert.Equal(-5, written);
 
-#if NET9_0_OR_GREATER
+#if NET
             Assert.Throws<InvalidOperationException>(() => writer.Encode<object>(_ => {
                 Assert.Fail("Callback should not have been called.");
                 return null;

src/libraries/System.Formats.Asn1/tests/Writer/SimpleWriterTests.cs

@@ -49,7 +49,7 @@ public static void EncodeEmpty(AsnEncodingRules ruleSet)
             Assert.Equal(0, written);
             Assert.True(writer.EncodedValueEquals(ReadOnlySpan<byte>.Empty));
 
-#if NET9_0_OR_GREATER
+#if NET
             writer.Encode<object>(encoded => {
                 Assert.Equal(0, encoded.Length);
                 return null;
@@ -251,7 +251,7 @@ public static void InitialCapacity_ResizeBlockAligns()
             Assert.Equal(1024, buffer?.Length);
         }
 
-#if NET9_0_OR_GREATER
+#if NET
         [Fact]
         public static void Encode_Callback_NoModifications()
         {

src/libraries/System.Text.Json/tests/Common/MetadataTests.cs

@@ -344,7 +344,7 @@ public async Task ClassWithRefStructConstructorParameter_Serialization()
             }
         }
 
-#if NET9_0_OR_GREATER
+#if NET
         [Fact]
         public void CollectionWithRefStructElement_Serialization()
         {
@@ -635,7 +635,7 @@ public ClassWithRefStructConstructorParameter(ReadOnlySpan<char> value)
             public string Value { get; }
         }
 
-#if NET9_0_OR_GREATER
+#if NET
         public class CollectionWithRefStructElement : IEnumerable<ReadOnlySpan<char>>
         {
             private List<string> _values = new();

src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/Serialization/MetadataTests.cs

@@ -42,7 +42,7 @@ public partial class MetadataTests_SourceGen() : MetadataTests(new StringSeriali
         [JsonSerializable(typeof(ClassWithRequiredAndOptionalConstructorParameters))]
         [JsonSerializable(typeof(ClassWithRefStructProperty))]
         [JsonSerializable(typeof(ClassWithRefStructConstructorParameter))]
-#if NET9_0_OR_GREATER
+#if NET
         [JsonSerializable(typeof(CollectionWithRefStructElement))]
 #endif
         partial class Context : JsonSerializerContext;

src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Unit.Tests/JsonSourceGeneratorDiagnosticsTests.cs

@@ -705,7 +705,7 @@ public partial class MyContext : JsonSerializerContext
             CompilationHelper.AssertEqualDiagnosticMessages(expectedDiagnostics, result.Diagnostics);
         }
 
-#if NET9_0_OR_GREATER
+#if NET
         [Fact]
         public void CollectionWithRefStructElement_CompilesWithWarning()
         {