chore: add .NET 10.0 support and update target frameworks (#1105)

hjgraca · web-flow · commit f7b8f22d766f · 2025-12-19T12:51:12.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,6 +28,7 @@ jobs:
         with:
           dotnet-version: |
             8.0.x
+            10.0.x
 
       - name: Install dependencies
         run: dotnet restore
@@ -36,7 +37,7 @@ jobs:
         run: dotnet build --configuration Release --no-restore /tl
 
       - name: Test & Code Coverage
-        run: dotnet test --no-restore --filter "Category!=E2E" --collect:"XPlat Code Coverage" --results-directory ./codecov --verbosity normal
+        run: dotnet test --no-restore --filter "Category!=E2E" --collect:"XPlat Code Coverage" --results-directory ./codecov
 
       - name: Codecov
         uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # 5.5.2
diff --git a/.github/workflows/examples-tests.yml b/.github/workflows/examples-tests.yml
@@ -28,6 +28,7 @@ jobs:
         with:
           dotnet-version: |
             8.0.x
+            10.0.x
 
       - name: Install dependencies
         run: dotnet restore
diff --git a/.github/workflows/publish-artifacts-examples-tests.yml b/.github/workflows/publish-artifacts-examples-tests.yml
@@ -34,6 +34,7 @@ jobs:
         with:
           dotnet-version: |
             8.0.x
+            10.0.x
 
       - name: Build libraries
         run: dotnet build ./libraries/ --configuration Release
@@ -64,6 +65,7 @@ jobs:
         with:
           dotnet-version: |
             8.0.x
+            10.0.x
 
       - name: Download packages
         uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # 6.0.0
@@ -123,6 +125,7 @@ jobs:
         with:
           dotnet-version: |
             8.0.x
+            10.0.x
 
       - name: Setup GitHub Packages source
         run: |
diff --git a/libraries/src/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.AspNetCore/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.AspNetCore.csproj b/libraries/src/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.AspNetCore/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.AspNetCore.csproj
@@ -6,7 +6,6 @@
         <Description>Powertools for AWS Lambda (.NET) - Event Handler Bedrock Agent Function Resolver AspNetCore package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.AspNetCore</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.AspNetCore</RootNamespace>
-        <TargetFrameworks>net8.0</TargetFrameworks>
         <TargetMultiFramework>false</TargetMultiFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
diff --git a/libraries/src/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.csproj b/libraries/src/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.csproj
@@ -4,7 +4,6 @@
     <PropertyGroup>
         <PackageId>AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction</PackageId>
         <Description>Powertools for AWS Lambda (.NET) - Event Handler Bedrock Agent Function Resolver package.</Description>
-        <TargetFrameworks>net8.0</TargetFrameworks>
         <TargetMultiFramework>false</TargetMultiFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
diff --git a/libraries/src/AWS.Lambda.Powertools.EventHandler/AWS.Lambda.Powertools.EventHandler.csproj b/libraries/src/AWS.Lambda.Powertools.EventHandler/AWS.Lambda.Powertools.EventHandler.csproj
@@ -6,7 +6,6 @@
         <Description>Powertools for AWS Lambda (.NET) - Event Handler package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.EventHandler</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.EventHandler</RootNamespace>
-        <TargetFrameworks>net8.0</TargetFrameworks>
         <TargetMultiFramework>false</TargetMultiFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
diff --git a/libraries/src/AWS.Lambda.Powertools.Kafka.Avro/AWS.Lambda.Powertools.Kafka.Avro.csproj b/libraries/src/AWS.Lambda.Powertools.Kafka.Avro/AWS.Lambda.Powertools.Kafka.Avro.csproj
@@ -7,7 +7,6 @@
         <Description>Powertools for AWS Lambda (.NET) - Kafka Avro consumer package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.Kafka.Avro</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Kafka.Avro</RootNamespace>
-        <TargetFrameworks>net8.0</TargetFrameworks>
         <TargetMultiFramework>false</TargetMultiFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
diff --git a/libraries/src/AWS.Lambda.Powertools.Kafka.Json/AWS.Lambda.Powertools.Kafka.Json.csproj b/libraries/src/AWS.Lambda.Powertools.Kafka.Json/AWS.Lambda.Powertools.Kafka.Json.csproj
@@ -6,7 +6,6 @@
         <Description>Powertools for AWS Lambda (.NET) - Kafka Json consumer package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.Kafka.Json</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Kafka.Json</RootNamespace>
-        <TargetFrameworks>net8.0</TargetFrameworks>
         <TargetMultiFramework>false</TargetMultiFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
diff --git a/libraries/src/AWS.Lambda.Powertools.Kafka.Protobuf/AWS.Lambda.Powertools.Kafka.Protobuf.csproj b/libraries/src/AWS.Lambda.Powertools.Kafka.Protobuf/AWS.Lambda.Powertools.Kafka.Protobuf.csproj
@@ -6,7 +6,6 @@
         <Description>Powertools for AWS Lambda (.NET) - Kafka Protobuf consumer package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.Kafka.Protobuf</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Kafka.Protobuf</RootNamespace>
-        <TargetFrameworks>net8.0</TargetFrameworks>
         <TargetMultiFramework>false</TargetMultiFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
diff --git a/libraries/src/AWS.Lambda.Powertools.Kafka/AWS.Lambda.Powertools.Kafka.csproj b/libraries/src/AWS.Lambda.Powertools.Kafka/AWS.Lambda.Powertools.Kafka.csproj
@@ -6,7 +6,6 @@
         <Description>Powertools for AWS Lambda (.NET) - Kafka consumer package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.Kafka</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Kafka</RootNamespace>
-        <TargetFrameworks>net8.0</TargetFrameworks>
         <TargetMultiFramework>false</TargetMultiFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
diff --git a/libraries/src/AWS.Lambda.Powertools.Metrics.AspNetCore/AWS.Lambda.Powertools.Metrics.AspNetCore.csproj b/libraries/src/AWS.Lambda.Powertools.Metrics.AspNetCore/AWS.Lambda.Powertools.Metrics.AspNetCore.csproj
@@ -6,7 +6,6 @@
         <Description>Powertools for AWS Lambda (.NET) - Metrics AspNetCore package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.Metrics.AspNetCore</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Metrics.AspNetCore</RootNamespace>
-        <TargetFrameworks>net8.0</TargetFrameworks>
         <TargetMultiFramework>false</TargetMultiFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
diff --git a/libraries/src/Directory.Build.props b/libraries/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
         <LangVersion>default</LangVersion>
         <!-- Version is generated when packaging the individual csproj -->
         <Version>$(Version)</Version>
diff --git a/libraries/tests/AWS.Lambda.Powertools.EventHandler.Tests/AWS.Lambda.Powertools.EventHandler.Tests.csproj b/libraries/tests/AWS.Lambda.Powertools.EventHandler.Tests/AWS.Lambda.Powertools.EventHandler.Tests.csproj
@@ -5,7 +5,6 @@
     <PropertyGroup>
         <AssemblyName>AWS.Lambda.Powertools.EventHandler.Tests</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.EventHandler.Tests</RootNamespace>
-        <TargetFrameworks>net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
diff --git a/libraries/tests/AWS.Lambda.Powertools.Kafka.Tests/AWS.Lambda.Powertools.Kafka.Tests.csproj b/libraries/tests/AWS.Lambda.Powertools.Kafka.Tests/AWS.Lambda.Powertools.Kafka.Tests.csproj
@@ -5,7 +5,6 @@
     <PropertyGroup>
         <AssemblyName>AWS.Lambda.Powertools.Kafka.Tests</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Kafka.Tests</RootNamespace>
-        <TargetFrameworks>net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
diff --git a/libraries/tests/AWS.Lambda.Powertools.Metrics.AspNetCore.Tests/AWS.Lambda.Powertools.Metrics.AspNetCore.Tests.csproj b/libraries/tests/AWS.Lambda.Powertools.Metrics.AspNetCore.Tests/AWS.Lambda.Powertools.Metrics.AspNetCore.Tests.csproj
@@ -4,7 +4,6 @@
     <PropertyGroup>
         <AssemblyName>AWS.Lambda.Powertools.Metrics.AspNetCore.Tests</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Metrics.AspNetCore.Tests</RootNamespace>
-        <TargetFrameworks>net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
diff --git a/libraries/tests/AWS.Lambda.Powertools.Metrics.AspNetCore.Tests/MetricsEndpointExtensionsTests.cs b/libraries/tests/AWS.Lambda.Powertools.Metrics.AspNetCore.Tests/MetricsEndpointExtensionsTests.cs
@@ -32,7 +32,7 @@ public async Task When_WithMetrics_Should_Add_ColdStart()
 
         var app = builder.Build();
 
-        app.MapGet("/test", () => Results.Ok(new { success = true })).WithMetrics();
+        app.MapGet("/test", () => Results.Text("ok")).WithMetrics();
 
         await app.StartAsync();
         var client = app.GetTestClient();
@@ -82,7 +82,7 @@ public async Task When_WithMetrics_Should_Add_ColdStart_Dimensions()
             await next();
         });
 
-        app.MapGet("/test", () => Results.Ok(new { success = true })).WithMetrics();
+        app.MapGet("/test", () => Results.Text("ok")).WithMetrics();
 
         await app.StartAsync();
         var client = app.GetTestClient();
@@ -135,7 +135,7 @@ public async Task When_WithMetrics_Should_Add_ColdStart_Default_Dimensions()
             await next();
         });
 
-        app.MapGet("/test", () => Results.Ok(new { success = true })).WithMetrics();
+        app.MapGet("/test", () => Results.Text("ok")).WithMetrics();
 
         await app.StartAsync();
         var client = app.GetTestClient();
diff --git a/libraries/tests/AWS.Lambda.Powertools.Tracing.Tests/TracingAttributeTest.cs b/libraries/tests/AWS.Lambda.Powertools.Tracing.Tests/TracingAttributeTest.cs
@@ -177,22 +177,43 @@ private static void ClearEnvironment()
     }
 
     [Collection("TracingTests")]
-    public class TracingAttributeLambdaEnvironmentTest
+    public class TracingAttributeLambdaEnvironmentTest : IDisposable
     {
         private readonly HandlerFunctions _handler;
+        private Segment _testSegment;
     
         public TracingAttributeLambdaEnvironmentTest()
         {
             _handler = new HandlerFunctions();
+            
+            // Clean up any existing X-Ray context before test
+            CleanupXRayContext();
+        }
+        
+        private static void CleanupXRayContext()
+        {
+            // Clear environment to ensure we're not in Lambda mode
+            Environment.SetEnvironmentVariable("LAMBDA_TASK_ROOT", null);
+            
+            try
+            {
+                AWSXRayRecorder.Instance.TraceContext.ClearEntity();
+            }
+            catch
+            {
+                // Ignore if no entity exists
+            }
+            
+            XRayRecorder.ResetInstance();
         }
         
         [Fact]
         public void Tracing_WhenOutsideOfLambdaEnv_DisablesTracing()
         {
-            // Arrange
-            
-            // Need to manually create the initial segment
-            AWSXRayRecorder.Instance.BeginSegment("foo");
+            // Arrange - Create segment directly without using BeginSegment to avoid Facade Segment issues
+            _testSegment = new Segment("foo");
+            _testSegment.SetStartTimeToNow();
+            AWSXRayRecorder.Instance.TraceContext.SetEntity(_testSegment);
     
             // Act
             // Cold Start Execution
@@ -205,8 +226,23 @@ public void Tracing_WhenOutsideOfLambdaEnv_DisablesTracing()
             Assert.Empty(segmentCold.Annotations);
             Assert.False(segmentCold.IsSubsegmentsAdded);
             Assert.False(segmentCold.IsMetadataAdded);
-
-            AWSXRayRecorder.Instance.EndSegment();
+        }
+        
+        public void Dispose()
+        {
+            try
+            {
+                if (_testSegment != null)
+                {
+                    _testSegment.SetEndTimeToNow();
+                }
+                AWSXRayRecorder.Instance.TraceContext.ClearEntity();
+            }
+            catch
+            {
+                // Ignore cleanup errors
+            }
+            XRayRecorder.ResetInstance();
         }
     }
     
diff --git a/libraries/tests/Directory.Build.props b/libraries/tests/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
