Add trimming support for RuntimeSupport, SystemTextJson serializer an…

…d Lambda event packages
aws · Oct 25, 2023 · deba8a9 · deba8a9
1 parent 166ed95
commit deba8a9
Show file tree

Hide file tree

Showing 99 changed files with 506 additions and 331 deletions.
diff --git a/Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayCustomAuthorizerPolicy.cs b/Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayCustomAuthorizerPolicy.cs
@@ -10,15 +10,15 @@ public class APIGatewayCustomAuthorizerPolicy
         /// <summary>
         /// Gets or sets the IAM API version.
         /// </summary>
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("Version")]
 #endif
         public string Version { get; set; } = "2012-10-17";
 
         /// <summary>
         /// Gets or sets a list of IAM policy statements to apply.
         /// </summary>
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("Statement")]
 #endif
         public List<IAMPolicyStatement> Statement { get; set; } = new List<IAMPolicyStatement>();
@@ -31,23 +31,23 @@ public class IAMPolicyStatement
             /// <summary>
             /// Gets or sets the effect the statement has.
             /// </summary>
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("Effect")]
 #endif
             public string Effect { get; set; } = "Allow";
 
             /// <summary>
             /// Gets or sets the action/s the statement has.
             /// </summary>
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("Action")]
 #endif
             public HashSet<string> Action { get; set; }
 
             /// <summary>
             /// Gets or sets the resources the statement applies to.
             /// </summary>
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("Resource")]
 #endif
             public HashSet<string> Resource { get; set; }

diff --git a/Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayCustomAuthorizerResponse.cs b/Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayCustomAuthorizerResponse.cs
@@ -12,7 +12,7 @@ public class APIGatewayCustomAuthorizerResponse
         /// Gets or sets the ID of the principal.
         /// </summary>
         [DataMember(Name = "principalId")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("principalId")]
 #endif
         public string PrincipalID { get; set; }
@@ -21,7 +21,7 @@ public class APIGatewayCustomAuthorizerResponse
         /// Gets or sets the <see cref="APIGatewayCustomAuthorizerPolicy"/> policy document.
         /// </summary>
         [DataMember(Name = "policyDocument")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("policyDocument")]
 #endif
         public APIGatewayCustomAuthorizerPolicy PolicyDocument { get; set; } = new APIGatewayCustomAuthorizerPolicy();
@@ -30,7 +30,7 @@ public class APIGatewayCustomAuthorizerResponse
         /// Gets or sets the <see cref="APIGatewayCustomAuthorizerContext"/> property.
         /// </summary>
         [DataMember(Name = "context")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("context")]
 #endif
         public APIGatewayCustomAuthorizerContextOutput Context { get; set; }
@@ -39,7 +39,7 @@ public class APIGatewayCustomAuthorizerResponse
         /// Gets or sets the usageIdentifierKey.
         /// </summary>
         [DataMember(Name = "usageIdentifierKey")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("usageIdentifierKey")]
 #endif
         public string UsageIdentifierKey { get; set; }

diff --git a/Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayCustomAuthorizerV2IamResponse.cs b/Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayCustomAuthorizerV2IamResponse.cs
@@ -14,7 +14,7 @@ public class APIGatewayCustomAuthorizerV2IamResponse
         /// Gets or sets the ID of the principal.
         /// </summary>
         [DataMember(Name = "principalId")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("principalId")]
 #endif
         public string PrincipalID { get; set; }
@@ -23,7 +23,7 @@ public class APIGatewayCustomAuthorizerV2IamResponse
         /// Gets or sets the <see cref="APIGatewayCustomAuthorizerPolicy"/> policy document.
         /// </summary>
         [DataMember(Name = "policyDocument")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("policyDocument")]
 #endif
         public APIGatewayCustomAuthorizerPolicy PolicyDocument { get; set; } = new APIGatewayCustomAuthorizerPolicy();
@@ -32,7 +32,7 @@ public class APIGatewayCustomAuthorizerV2IamResponse
         /// Gets or sets the <see cref="APIGatewayCustomAuthorizerContext"/> property.
         /// </summary>
         [DataMember(Name = "context")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("context")]
 #endif
         public Dictionary<string, object> Context { get; set; }

diff --git a/Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayCustomAuthorizerV2SimpleResponse.cs b/Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayCustomAuthorizerV2SimpleResponse.cs
@@ -14,7 +14,7 @@ public class APIGatewayCustomAuthorizerV2SimpleResponse
         /// Gets or sets authorization result.
         /// </summary>
         [DataMember(Name = "isAuthorized")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("isAuthorized")]
 #endif
         public bool IsAuthorized { get; set; }
@@ -23,7 +23,7 @@ public class APIGatewayCustomAuthorizerV2SimpleResponse
         /// Gets or sets the <see cref="APIGatewayCustomAuthorizerContext"/> property.
         /// </summary>
         [DataMember(Name = "context")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("context")]
 #endif
         public Dictionary<string, object> Context { get; set; }

diff --git a/Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayHttpApiV2ProxyResponse.cs b/Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayHttpApiV2ProxyResponse.cs
@@ -17,7 +17,7 @@ public class APIGatewayHttpApiV2ProxyResponse
         /// The HTTP status code for the request
         /// </summary>
         [DataMember(Name = "statusCode")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("statusCode")]
 #endif
         public int StatusCode { get; set; }
@@ -26,7 +26,7 @@ public class APIGatewayHttpApiV2ProxyResponse
         /// The Http headers returned in the response. Multiple header values set for the the same header should be separate by a comma.
         /// </summary>
         [DataMember(Name = "headers")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("headers")]
 #endif
         public IDictionary<string, string> Headers { get; set; }
@@ -67,7 +67,7 @@ public void SetHeaderValues(string headerName, IEnumerable<string> values, bool
         /// The cookies returned in the response.
         /// </summary>
         [DataMember(Name = "cookies")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("cookies")]
 #endif
         public string[] Cookies { get; set; }
@@ -76,7 +76,7 @@ public void SetHeaderValues(string headerName, IEnumerable<string> values, bool
         /// The response body
         /// </summary>
         [DataMember(Name = "body")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("body")]
 #endif
         public string Body { get; set; }
@@ -85,7 +85,7 @@ public void SetHeaderValues(string headerName, IEnumerable<string> values, bool
         /// Flag indicating whether the body should be treated as a base64-encoded string
         /// </summary>
         [DataMember(Name = "isBase64Encoded")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("isBase64Encoded")]
 #endif
         public bool IsBase64Encoded { get; set; }

diff --git a/Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayProxyResponse.cs b/Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayProxyResponse.cs
@@ -14,7 +14,7 @@ public class APIGatewayProxyResponse
         /// The HTTP status code for the request
         /// </summary>
         [DataMember(Name = "statusCode")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("statusCode")]
 #endif
         public int StatusCode { get; set; }
@@ -25,7 +25,7 @@ public class APIGatewayProxyResponse
         /// before returning back the headers to the caller.
         /// </summary>
         [DataMember(Name = "headers")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("headers")]
 #endif
         public IDictionary<string, string> Headers { get; set; }
@@ -36,7 +36,7 @@ public class APIGatewayProxyResponse
         /// before returning back the headers to the caller.
         /// </summary>
         [DataMember(Name = "multiValueHeaders")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("multiValueHeaders")]
 #endif
         public IDictionary<string, IList<string>> MultiValueHeaders { get; set; }
@@ -45,7 +45,7 @@ public class APIGatewayProxyResponse
         /// The response body
         /// </summary>
         [DataMember(Name = "body")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("body")]
 #endif
         public string Body { get; set; }
@@ -54,7 +54,7 @@ public class APIGatewayProxyResponse
         /// Flag indicating whether the body should be treated as a base64-encoded string
         /// </summary>
         [DataMember(Name = "isBase64Encoded")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
             [System.Text.Json.Serialization.JsonPropertyName("isBase64Encoded")]
 #endif
         public bool IsBase64Encoded { get; set; }

diff --git a/Libraries/src/Amazon.Lambda.APIGatewayEvents/Amazon.Lambda.APIGatewayEvents.csproj b/Libraries/src/Amazon.Lambda.APIGatewayEvents/Amazon.Lambda.APIGatewayEvents.csproj
@@ -3,10 +3,10 @@
   <Import Project="..\..\..\buildtools\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>    
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net8.0</TargetFrameworks>    
     <Description>Amazon Lambda .NET Core support - API Gateway package.</Description>
     <AssemblyTitle>Amazon.Lambda.APIGatewayEvents</AssemblyTitle>
-    <VersionPrefix>2.6.0</VersionPrefix>
+    <VersionPrefix>2.7.0</VersionPrefix>
     <AssemblyName>Amazon.Lambda.APIGatewayEvents</AssemblyName>
     <PackageId>Amazon.Lambda.APIGatewayEvents</PackageId>
     <PackageTags>AWS;Amazon;Lambda</PackageTags>
@@ -17,9 +17,6 @@
     <DefineConstants>NETSTANDARD_2_0</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <DefineConstants>NETCOREAPP_3_1</DefineConstants>
-  </PropertyGroup>
   <ItemGroup>
 	<None Include="README.md" Pack="true" PackagePath="\"/>
   </ItemGroup>	
@@ -28,4 +25,8 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<WarningsAsErrors>IL2026,IL2067,IL2075</WarningsAsErrors>
+		<IsTrimmable>true</IsTrimmable>
+	</PropertyGroup>
 </Project>
diff --git a/...n.Lambda.ApplicationLoadBalancerEvents/Amazon.Lambda.ApplicationLoadBalancerEvents.csproj b/...n.Lambda.ApplicationLoadBalancerEvents/Amazon.Lambda.ApplicationLoadBalancerEvents.csproj
@@ -3,13 +3,17 @@
     <Import Project="..\..\..\buildtools\common.props" />
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;netcoreapp3.1;net8.0</TargetFrameworks>
         <Description>Amazon Lambda .NET Core support - Application Load Balancer package.</Description>
         <AssemblyTitle>Amazon.Lambda.ApplicationLoadBalancerEvents</AssemblyTitle>
-        <VersionPrefix>2.1.0</VersionPrefix>
+        <VersionPrefix>2.2.0</VersionPrefix>
         <AssemblyName>Amazon.Lambda.ApplicationLoadBalancerEvents</AssemblyName>
         <PackageId>Amazon.Lambda.ApplicationLoadBalancerEvents</PackageId>
         <PackageTags>AWS;Amazon;Lambda</PackageTags>
     </PropertyGroup>
-
+
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<WarningsAsErrors>IL2026,IL2067,IL2075</WarningsAsErrors>
+		<IsTrimmable>true</IsTrimmable>
+	</PropertyGroup>	
 </Project>
diff --git a/Libraries/src/Amazon.Lambda.ApplicationLoadBalancerEvents/ApplicationLoadBalancerResponse.cs b/Libraries/src/Amazon.Lambda.ApplicationLoadBalancerEvents/ApplicationLoadBalancerResponse.cs
@@ -14,7 +14,7 @@ public class ApplicationLoadBalancerResponse
         /// The HTTP status code for the request
         /// </summary>
         [DataMember(Name = "statusCode")]
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("statusCode")]
 #endif
         public int StatusCode { get; set; }
@@ -23,7 +23,7 @@ public class ApplicationLoadBalancerResponse
         /// The HTTP status description for the request
         /// </summary>
         [DataMember(Name = "statusDescription")]
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("statusDescription")]
 #endif
         public string StatusDescription { get; set; }
@@ -33,7 +33,7 @@ public class ApplicationLoadBalancerResponse
         /// Note: Use this property when "Multi value headers" is disabled on ELB Target Group.
         /// </summary>
         [DataMember(Name = "headers")]
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("headers")]
 #endif
         public IDictionary<string, string> Headers { get; set; }
@@ -43,7 +43,7 @@ public class ApplicationLoadBalancerResponse
         /// Note: Use this property when "Multi value headers" is enabled on ELB Target Group.
         /// </summary>
         [DataMember(Name = "multiValueHeaders")]
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("multiValueHeaders")]
 #endif
         public IDictionary<string, IList<string>> MultiValueHeaders { get; set; }
@@ -52,7 +52,7 @@ public class ApplicationLoadBalancerResponse
         /// The response body
         /// </summary>
         [DataMember(Name = "body")]
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("body")]
 #endif
         public string Body { get; set; }
@@ -61,7 +61,7 @@ public class ApplicationLoadBalancerResponse
         /// Flag indicating whether the body should be treated as a base64-encoded string
         /// </summary>
         [DataMember(Name = "isBase64Encoded")]
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("isBase64Encoded")]
 #endif
         public bool IsBase64Encoded { get; set; }        

diff --git a/Libraries/src/Amazon.Lambda.CloudWatchEvents/Amazon.Lambda.CloudWatchEvents.csproj b/Libraries/src/Amazon.Lambda.CloudWatchEvents/Amazon.Lambda.CloudWatchEvents.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\buildtools\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net8.0</TargetFrameworks>
     <Description>Amazon Lambda .NET Core support - CloudWatchEvents package.</Description>
     <AssemblyTitle>Amazon.Lambda.CloudWatchEvents</AssemblyTitle>
     <VersionPrefix>4.3.0</VersionPrefix>
@@ -12,8 +12,8 @@
     <PackageTags>AWS;Amazon;Lambda</PackageTags>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <DefineConstants>NETCOREAPP_3_1</DefineConstants>
-  </PropertyGroup>
-
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<WarningsAsErrors>IL2026,IL2067,IL2075</WarningsAsErrors>
+		<IsTrimmable>true</IsTrimmable>
+	</PropertyGroup>
 </Project>
diff --git a/Libraries/src/Amazon.Lambda.CloudWatchEvents/CloudWatchEvent.cs b/Libraries/src/Amazon.Lambda.CloudWatchEvents/CloudWatchEvent.cs
@@ -40,8 +40,8 @@ public class CloudWatchEvent<T>
         /// For example, ScheduledEvent will be null
         /// For example, ECSEvent could be "ECS Container Instance State Change" or "ECS Task State Change"
         /// </summary>
-#if NETCOREAPP_3_1
-            [System.Text.Json.Serialization.JsonPropertyName("detail-type")]
+#if NETCOREAPP3_1_OR_GREATER
+        [System.Text.Json.Serialization.JsonPropertyName("detail-type")]
 #endif
         public string DetailType { get; set; }
 

diff --git a/Libraries/src/Amazon.Lambda.CloudWatchEvents/S3Events/S3Object.cs b/Libraries/src/Amazon.Lambda.CloudWatchEvents/S3Events/S3Object.cs
@@ -30,7 +30,7 @@ public class S3Object
         /// The version ID of the object.
         /// </summary>
         [DataMember(Name = "version-id")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("version-id")]
 #endif
         public string VersionId { get; set; }

diff --git a/Libraries/src/Amazon.Lambda.CloudWatchEvents/S3Events/S3ObjectCreate.cs b/Libraries/src/Amazon.Lambda.CloudWatchEvents/S3Events/S3ObjectCreate.cs
@@ -12,7 +12,7 @@ public class S3ObjectCreate : S3ObjectEventDetails
         /// The source IP of the API request.
         /// </summary>
         [DataMember(Name = "source-ip-address")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("source-ip-address")]
 #endif
         public string SourceIpAddress { get; set; }

diff --git a/Libraries/src/Amazon.Lambda.CloudWatchEvents/S3Events/S3ObjectDelete.cs b/Libraries/src/Amazon.Lambda.CloudWatchEvents/S3Events/S3ObjectDelete.cs
@@ -12,7 +12,7 @@ public class S3ObjectDelete : S3ObjectEventDetails
         /// The source IP of the API request.
         /// </summary>
         [DataMember(Name = "source-ip-address")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("source-ip-address")]
 #endif
         public string SourceIpAddress { get; set; }
@@ -27,7 +27,7 @@ public class S3ObjectDelete : S3ObjectEventDetails
         /// The type of object deletion event.
         /// </summary>
         [DataMember(Name = "deletion-type")]
-#if NETCOREAPP_3_1
+#if NETCOREAPP3_1_OR_GREATER
         [System.Text.Json.Serialization.JsonPropertyName("deletion-type")]
 #endif
         public string DeletionType { get; set; }