Use built-in NullabilityInfoContext when available

ch-robinson · Sep 11, 2023 · 4074214 · 4074214
1 parent 9cd1650
commit 4074214
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/src/Chr.Avro/Abstract/RecordSchemaBuilderCase.cs b/src/Chr.Avro/Abstract/RecordSchemaBuilderCase.cs
@@ -9,10 +9,11 @@ namespace Chr.Avro.Abstract
     using System.Runtime.Serialization;
     using System.Text.RegularExpressions;
     using Chr.Avro.Infrastructure;
+    #if !NET6_0_OR_GREATER
     using NullabilityInfoContext = Chr.Avro.Infrastructure.NullabilityInfoContext;
     using NullabilityState = Chr.Avro.Infrastructure.NullabilityState;
     using NullabilityInfo = Chr.Avro.Infrastructure.NullabilityInfo;
-
+    #endif
 
     /// <summary>
     /// Implements a <see cref="SchemaBuilder" /> case that matches any non-array or non-primitive

diff --git a/src/Chr.Avro/Infrastructure/NullabilityInfo.cs b/src/Chr.Avro/Infrastructure/NullabilityInfo.cs
@@ -1,3 +1,4 @@
+#if !NET6_0_OR_GREATER
 namespace Chr.Avro.Infrastructure
 {
     using System;
@@ -70,3 +71,4 @@ internal NullabilityInfo(
         public NullabilityInfo[] GenericTypeArguments { get; }
     }
 }
+#endif
diff --git a/src/Chr.Avro/Infrastructure/NullabilityInfoContext.cs b/src/Chr.Avro/Infrastructure/NullabilityInfoContext.cs
@@ -1,3 +1,4 @@
+#if !NET6_0_OR_GREATER
 namespace Chr.Avro.Infrastructure
 {
     using System;
@@ -572,3 +573,4 @@ public bool ParseNullableState(int index, ref NullabilityState state)
         }
     }
 }
+#endif
diff --git a/src/Chr.Avro/Infrastructure/NullabilityState.cs b/src/Chr.Avro/Infrastructure/NullabilityState.cs
@@ -1,3 +1,4 @@
+#if !NET6_0_OR_GREATER
 namespace Chr.Avro.Infrastructure
 {
     /// <summary>
@@ -26,3 +27,4 @@ internal enum NullabilityState
         Nullable,
     }
 }
+#endif