Merge pull request #995 from dcabib/chore/deprecate-net6

chore: drop .NET 6 support, go .NET 8 only

Author: hjgraca

.github/workflows/build.yml

@@ -27,7 +27,6 @@ jobs:
         uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # 5.0.0
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
 
       - name: Install dependencies

.github/workflows/examples-tests.yml

@@ -27,7 +27,6 @@ jobs:
         uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # 5.0.0
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
 
       - name: Install dependencies

.github/workflows/publish-artifacts-examples-tests.yml

@@ -33,7 +33,6 @@ jobs:
         uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # 5.0.0
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
 
       - name: Build libraries
@@ -64,7 +63,6 @@ jobs:
         uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # 5.0.0
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
 
       - name: Download packages
@@ -124,7 +122,6 @@ jobs:
         uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # 5.0.0
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
 
       - name: Setup GitHub Packages source

libraries/src/AWS.Lambda.Powertools.Idempotency/Idempotency.cs

@@ -166,9 +166,8 @@ public IdempotencyBuilder WithOptions(IdempotencyOptions options)
             return this;
         }
 
-#if NET8_0_OR_GREATER
         /// <summary>
-        /// Set Customer JsonSerializerContext to append to IdempotencySerializationContext 
+        /// Set Customer JsonSerializerContext to append to IdempotencySerializationContext
         /// </summary>
         /// <param name="context"></param>
         /// <returns>IdempotencyBuilder</returns>
@@ -177,6 +176,5 @@ public IdempotencyBuilder WithJsonSerializationContext(JsonSerializerContext con
             IdempotencySerializer.AddTypeInfoResolver(context);
             return this;
         }
-#endif
     }
 }

libraries/src/AWS.Lambda.Powertools.Idempotency/IdempotencyOptionsBuilder.cs

@@ -40,7 +40,7 @@ public class IdempotencyOptionsBuilder
     /// <summary>
     /// Default Hash function
     /// </summary>
-    private string _hashFunction = "MD5";
+    private readonly string _hashFunction = "MD5";
 
     /// <summary>
     /// Response hook function
@@ -160,15 +160,9 @@ public IdempotencyOptionsBuilder WithExpiration(TimeSpan duration)
     /// </summary>
     /// <param name="hashFunction">Can be any algorithm supported by HashAlgorithm.Create</param>
     /// <returns>the instance of the builder (to chain operations)</returns>
-#if NET8_0_OR_GREATER
     [Obsolete("Idempotency uses MD5 and does not support other hash algorithms.")]
-#endif
     public IdempotencyOptionsBuilder WithHashFunction(string hashFunction)
     {
-#if NET6_0
-        // for backward compability keep this code in .net 6
-        _hashFunction = hashFunction;
-#endif
         return this;
     }
 

libraries/src/AWS.Lambda.Powertools.Idempotency/Internal/Serializers/IdempotencySerializationContext.cs

@@ -17,16 +17,12 @@
 
 namespace AWS.Lambda.Powertools.Idempotency.Internal.Serializers;
 
-#if NET8_0_OR_GREATER
-
-
 /// <summary>
-/// The source generated JsonSerializerContext to be used to Serialize Idempotency types 
+/// The source generated JsonSerializerContext to be used to Serialize Idempotency types
 /// </summary>
 [JsonSerializable(typeof(string))]
 [JsonSerializable(typeof(object))]
 public partial class IdempotencySerializationContext : JsonSerializerContext
 {
 
-}
-#endif
+}

libraries/src/AWS.Lambda.Powertools.Idempotency/Internal/Serializers/IdempotencySerializer.cs

@@ -29,16 +29,12 @@ private static void BuildDefaultOptions()
         {
             PropertyNameCaseInsensitive = true
         };
-#if NET8_0_OR_GREATER
         if (!RuntimeFeatureWrapper.IsDynamicCodeSupported)
         {
             _jsonOptions.TypeInfoResolverChain.Add(IdempotencySerializationContext.Default);
         }
-#endif
     }
 
-#if NET8_0_OR_GREATER
-
     /// <summary>
     /// Adds a JsonTypeInfoResolver to the JsonSerializerOptions.
     /// </summary>
@@ -73,7 +69,6 @@ internal static void SetJsonOptions(JsonSerializerOptions options)
     {
         _jsonOptions = options;
     }
-#endif
 
     /// <summary>
     /// Serializes the specified object to a JSON string.
@@ -83,9 +78,6 @@ internal static void SetJsonOptions(JsonSerializerOptions options)
     /// <returns>A JSON string representation of the object.</returns>
     internal static string Serialize(object value, Type inputType)
     {
-#if NET6_0
-        return JsonSerializer.Serialize(value, _jsonOptions);
-#else
         if (RuntimeFeatureWrapper.IsDynamicCodeSupported)
         {
 #pragma warning disable
@@ -100,7 +92,6 @@ internal static string Serialize(object value, Type inputType)
         }
 
         return JsonSerializer.Serialize(value, typeInfo);
-#endif
     }
 
     /// <summary>
@@ -113,15 +104,11 @@ internal static string Serialize(object value, Type inputType)
     [UnconditionalSuppressMessage("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "False positive")]
     internal static T Deserialize<T>(string value)
     {
-#if NET6_0
-        return JsonSerializer.Deserialize<T>(value,_jsonOptions);
-#else
         if (RuntimeFeatureWrapper.IsDynamicCodeSupported)
         {
             return JsonSerializer.Deserialize<T>(value, _jsonOptions);
         }
 
         return (T)JsonSerializer.Deserialize(value, GetTypeInfo(typeof(T)));
-#endif
     }
 }

libraries/src/AWS.Lambda.Powertools.Idempotency/Persistence/BasePersistenceStore.cs

@@ -324,12 +324,8 @@ private static bool IsMissingIdempotencyKey(JsonElement data)
     /// <exception cref="ArgumentException"></exception>
     internal string GenerateHash(JsonElement data)
     {
-#if NET8_0_OR_GREATER
         // starting .NET 8 no option to change hash algorithm
         using var hashAlgorithm = MD5.Create();
-#else
-        using var hashAlgorithm = HashAlgorithm.Create(_idempotencyOptions.HashFunction);
-#endif
         if (hashAlgorithm == null)
         {
             throw new ArgumentException("Invalid HashAlgorithm");

libraries/src/AWS.Lambda.Powertools.JMESPath/Serializers/JMESPathSerializationContext.cs

@@ -3,8 +3,6 @@
 
 namespace AWS.Lambda.Powertools.JMESPath.Serializers;
 
-#if NET8_0_OR_GREATER
-
 /// <summary>
 /// The source generated JsonSerializerContext to be used to Serialize JMESPath types 
 /// </summary>
@@ -16,6 +14,4 @@ namespace AWS.Lambda.Powertools.JMESPath.Serializers;
 [JsonSerializable(typeof(JsonElement))]
 public partial class JmesPathSerializationContext : JsonSerializerContext
 {
-}
-
-#endif
+}

libraries/src/AWS.Lambda.Powertools.JMESPath/Serializers/JMESPathSerializer.cs

@@ -16,12 +16,7 @@ internal static class JmesPathSerializer
     /// <returns>System.String.</returns>
     internal static string Serialize(object value, Type inputType)
     {
-#if NET6_0
-        return JsonSerializer.Serialize(value);
-#else
-
         return JsonSerializer.Serialize(value, inputType, JmesPathSerializationContext.Default);
-#endif
     }
 
     /// <summary>
@@ -32,11 +27,6 @@ internal static string Serialize(object value, Type inputType)
     /// <returns>T.</returns>
     internal static T Deserialize<T>(string value)
     {
-#if NET6_0
-        return JsonSerializer.Deserialize<T>(value);
-#else
-
         return (T)JsonSerializer.Deserialize(value, typeof(T), JmesPathSerializationContext.Default);
-#endif
     }
 }