Merge branch 'dev' into normj/net10-blueprints

Author: normj

CHANGELOG.md

@@ -1,3 +1,10 @@
+## Release 2025-12-12
+
+### Amazon.Lambda.Annotations (1.8.0)
+* Prepare Amazon.Lambda.Annotations for upcoming .NET 10 managed runtime
+### Amazon.Lambda.APIGatewayEvents (2.7.3)
+* Marked ProxyRequestContext.Error property as Obsolete for APIGatewayProxyRequest.
+
 ## Release 2025-11-21
 
 ### Amazon.Lambda.DynamoDBEvents.SDK.Convertor (2.0.1)

Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayProxyRequest.cs

@@ -1,4 +1,4 @@
-namespace Amazon.Lambda.APIGatewayEvents
+namespace Amazon.Lambda.APIGatewayEvents
 {
     using System;
     using System.Collections.Generic;
@@ -234,10 +234,11 @@ public class ProxyRequestContext
             /// Gets and sets the operation name.
             /// </summary>
             public string OperationName { get; set; }
-            
+
             /// <summary>
             /// Gets and sets the error.
             /// </summary>
+            [Obsolete("This property is obsolete since it is not used by AWS API Gateway and will never have value set by the service.")]
             public string Error { get; set; }
 
             /// <summary>

Libraries/src/Amazon.Lambda.APIGatewayEvents/Amazon.Lambda.APIGatewayEvents.csproj

@@ -6,7 +6,7 @@
     <TargetFrameworks>netstandard2.0;netcoreapp3.1;net8.0</TargetFrameworks>    
     <Description>Amazon Lambda .NET Core support - API Gateway package.</Description>
     <AssemblyTitle>Amazon.Lambda.APIGatewayEvents</AssemblyTitle>
-    <Version>2.7.2</Version>
+    <Version>2.7.3</Version>
     <AssemblyName>Amazon.Lambda.APIGatewayEvents</AssemblyName>
     <PackageId>Amazon.Lambda.APIGatewayEvents</PackageId>
     <PackageTags>AWS;Amazon;Lambda</PackageTags>

Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Amazon.Lambda.Annotations.SourceGenerator.csproj

@@ -20,7 +20,7 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <IncludeBuildOutput>false</IncludeBuildOutput>
 
-    <Version>1.7.0</Version>
+    <Version>1.8.0</Version>
   </PropertyGroup>
 
   <!-- Delay setting the package id till after resolving dependencies to avoid ambigious errors. -->

Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Generator.cs

@@ -16,7 +16,6 @@ namespace Amazon.Lambda.Annotations.SourceGenerator
     [Generator]
     public class Generator : ISourceGenerator
     {
-        private const string DEFAULT_LAMBDA_SERIALIZER = "Amazon.Lambda.Serialization.SystemTextJson.DefaultLambdaJsonSerializer";
         private readonly IFileManager _fileManager = new FileManager();
         private readonly IDirectoryManager _directoryManager = new DirectoryManager();
 
@@ -26,15 +25,17 @@ public class Generator : ISourceGenerator
         internal static readonly Dictionary<string, string> _targetFrameworksToRuntimes = new Dictionary<string, string>(2)
         {
             { "net6.0", "dotnet6" },
-            { "net8.0", "dotnet8" }
+            { "net8.0", "dotnet8" },
+            { "net10.0", "dotnet10" }
         };
 
         internal static readonly List<string> _allowedRuntimeValues = new List<string>(4)
         {
             "dotnet6",
             "provided.al2",
             "provided.al2023",
-            "dotnet8"
+            "dotnet8",
+            "dotnet10"
         };
 
         public Generator()

Libraries/src/Amazon.Lambda.Annotations/Amazon.Lambda.Annotations.csproj

@@ -11,7 +11,7 @@
     <AssemblyOriginatorKeyFile>..\..\..\buildtools\public.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
 
-    <Version>1.7.0</Version>
+    <Version>1.8.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">

Libraries/src/Amazon.Lambda.Annotations/LambdaGlobalPropertiesAttribute.cs

@@ -1,4 +1,4 @@
-
+
 using System;
 
 namespace Amazon.Lambda.Annotations
@@ -17,8 +17,8 @@ public class LambdaGlobalPropertiesAttribute : Attribute
         public bool GenerateMain { get; set; }
 
         /// <summary>
-        /// The runtime to set in the generated CloudFormation template. Either 'dotnet6', 'provided.al2', 'provided.al2023', or 'dotnet8'.
+        /// The runtime to set in the generated CloudFormation template. Either 'dotnet6', 'provided.al2', 'provided.al2023', 'dotnet8', or 'dotnet10'.
         /// </summary>
         public string Runtime { get; set; }
     }
-}
+}

Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/SourceGeneratorTests.cs

@@ -264,7 +264,7 @@ public async Task TestInvalidGlobalRuntime_ShouldError()
                     },
                     ExpectedDiagnostics =
                     {
-                        new DiagnosticResult("AWSLambda0112", DiagnosticSeverity.Error).WithMessage("The runtime selected in the Amazon.Lambda.Annotations.LambdaGlobalPropertiesAttribute is not a supported value. The valid values are: dotnet6, provided.al2, provided.al2023, dotnet8"),
+                        new DiagnosticResult("AWSLambda0112", DiagnosticSeverity.Error).WithMessage("The runtime selected in the Amazon.Lambda.Annotations.LambdaGlobalPropertiesAttribute is not a supported value. The valid values are: dotnet6, provided.al2, provided.al2023, dotnet8, dotnet10"),
                     }
                 }
             };

Libraries/test/TestExecutableServerlessApp/serverless.template

@@ -1,7 +1,7 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
   "Transform": "AWS::Serverless-2016-10-31",
-  "Description": "An AWS Serverless Application. This template is partially managed by Amazon.Lambda.Annotations (v1.7.0.0).",
+  "Description": "An AWS Serverless Application. This template is partially managed by Amazon.Lambda.Annotations (v1.8.0.0).",
   "Parameters": {
     "ArchitectureTypeParameter": {
       "Type": "String",

Libraries/test/TestServerlessApp.NET8/serverless.template

@@ -1,7 +1,7 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
   "Transform": "AWS::Serverless-2016-10-31",
-  "Description": "This template is partially managed by Amazon.Lambda.Annotations (v1.7.0.0).",
+  "Description": "This template is partially managed by Amazon.Lambda.Annotations (v1.8.0.0).",
   "Resources": {
     "TestServerlessAppNET8FunctionsToUpperGenerated": {
       "Type": "AWS::Serverless::Function",