Hide Base64Attribute in .NET8 onwards in favour of Base64StringAttrib…

…ute (#188)
tinglesoftware · Nov 20, 2023 · af31227 · af31227
1 parent 30f4d34
commit af31227
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Tingle.Extensions.DataAnnotations/Base64Attribute.cs b/src/Tingle.Extensions.DataAnnotations/Base64Attribute.cs
@@ -1,4 +1,5 @@
-namespace System.ComponentModel.DataAnnotations;
+#if !NET8_0_OR_GREATER
+namespace System.ComponentModel.DataAnnotations;
 
 /// <summary>
 /// Specifies that a data field value is a well-formed base 64 string.
@@ -15,6 +16,7 @@ public Base64Attribute() : base("The field {0} must be a valid base64 string.")
     public override bool IsValid(object? value)
     {
         if (value is not string s || string.IsNullOrEmpty(s)) return true;
+
         // attempt to convert from base64
         try
         {
@@ -27,3 +29,4 @@ public override bool IsValid(object? value)
         }
     }
 }
+#endif
diff --git a/tests/Tingle.Extensions.DataAnnotations.Tests/Base64AttributeTests.cs b/tests/Tingle.Extensions.DataAnnotations.Tests/Base64AttributeTests.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+#if !NET8_0_OR_GREATER
+using System.ComponentModel.DataAnnotations;
 
 namespace Tingle.Extensions.DataAnnotations.Tests;
 
@@ -34,3 +35,4 @@ public void Base64_Validation_Works(string testKey, bool expected)
 
     record TestModel([property: Base64] string? SomeKey);
 }
+#endif