From 29124519e35829024e115be8a7c9a97daa1efaa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cfisheraj=E2=80=9D?= <fisheraj@amazon.com>
Date: Tue, 21 Apr 2026 15:29:10 +0100
Subject: [PATCH] Migration to dotnet 10 from 3.1

---
 DotnetToLambda.sln                            |  13 --
 NuGet.Config                                  |   7 +
 docker-compose.yml                            |   4 +-
 global.json                                   |   5 +-
 .../DotnetToLambda.Api.csproj                 |   5 +-
 .../DotnetToLambda.Api/Program.cs             |  60 ++++---
 .../DotnetToLambda.Api/Startup.cs             |  63 -------
 .../DotnetToLambda.Core.csproj                |  18 +-
 .../Infrastructure/BookingContext.cs          |  46 +++--
 .../src/Infrastructure/Infrastructure.csproj  |  10 +-
 .../src/Infrastructure/InfrastructureStack.cs | 168 +++++++++---------
 .../src/Infrastructure/Program.cs             |  64 ++++---
 .../DotnetToLambda.Serverless.Config.csproj   |  22 +--
 .../ApplyDatabaseMigrations.csproj            |  10 +-
 .../aws-lambda-tools-defaults.json            |   4 +-
 .../src/CancelBooking/CancelBooking.csproj    |  10 +-
 .../aws-lambda-tools-defaults.json            |   4 +-
 .../src/ConfirmBooking/ConfirmBooking.csproj  |  10 +-
 .../aws-lambda-tools-defaults.json            |   4 +-
 .../ListForCustomer/ListForCustomer.csproj    |  10 +-
 .../aws-lambda-tools-defaults.json            |   4 +-
 .../src/ReserveBooking/ReserveBooking.csproj  |  10 +-
 .../aws-lambda-tools-defaults.json            |   4 +-
 .../src/Retrieve/Retrieve.csproj              |  10 +-
 .../Retrieve/aws-lambda-tools-defaults.json   |   4 +-
 .../DotnetToLambda.Serverless/template.yaml   |   2 +-
 26 files changed, 261 insertions(+), 310 deletions(-)
 create mode 100644 NuGet.Config
 delete mode 100644 src/DotnetToLambda.Api/DotnetToLambda.Api/Startup.cs

diff --git a/DotnetToLambda.sln b/DotnetToLambda.sln
index 96087be..18d04bb 100644
--- a/DotnetToLambda.sln
+++ b/DotnetToLambda.sln
@@ -138,18 +138,6 @@ Global
 		{1EB6729D-9846-441F-9C09-5F7CD563C0CE}.Release|x64.Build.0 = Release|Any CPU
 		{1EB6729D-9846-441F-9C09-5F7CD563C0CE}.Release|x86.ActiveCfg = Release|Any CPU
 		{1EB6729D-9846-441F-9C09-5F7CD563C0CE}.Release|x86.Build.0 = Release|Any CPU
-		{9BEB806D-2444-40FD-8871-E13174E291B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BEB806D-2444-40FD-8871-E13174E291B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9BEB806D-2444-40FD-8871-E13174E291B1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9BEB806D-2444-40FD-8871-E13174E291B1}.Debug|x64.Build.0 = Debug|Any CPU
-		{9BEB806D-2444-40FD-8871-E13174E291B1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9BEB806D-2444-40FD-8871-E13174E291B1}.Debug|x86.Build.0 = Debug|Any CPU
-		{9BEB806D-2444-40FD-8871-E13174E291B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9BEB806D-2444-40FD-8871-E13174E291B1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9BEB806D-2444-40FD-8871-E13174E291B1}.Release|x64.ActiveCfg = Release|Any CPU
-		{9BEB806D-2444-40FD-8871-E13174E291B1}.Release|x64.Build.0 = Release|Any CPU
-		{9BEB806D-2444-40FD-8871-E13174E291B1}.Release|x86.ActiveCfg = Release|Any CPU
-		{9BEB806D-2444-40FD-8871-E13174E291B1}.Release|x86.Build.0 = Release|Any CPU
 		{3630969D-0CBF-443D-9894-4DAC15B9D947}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3630969D-0CBF-443D-9894-4DAC15B9D947}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3630969D-0CBF-443D-9894-4DAC15B9D947}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -187,7 +175,6 @@ Global
 		{5B35C029-27CE-44ED-AFEF-A646F2CEC096} = {163A600C-DD7F-436D-A8B5-32F69D7041C5}
 		{43C59108-87C5-4F4B-81D8-481CDE6C2D6D} = {163A600C-DD7F-436D-A8B5-32F69D7041C5}
 		{1EB6729D-9846-441F-9C09-5F7CD563C0CE} = {163A600C-DD7F-436D-A8B5-32F69D7041C5}
-		{9BEB806D-2444-40FD-8871-E13174E291B1} = {12000098-E55C-49C0-B224-2027315833DB}
 		{3630969D-0CBF-443D-9894-4DAC15B9D947} = {163A600C-DD7F-436D-A8B5-32F69D7041C5}
 		{B4F8269C-8734-4F4D-8D17-E933EC07A054} = {6A524563-A123-4814-85AD-BD64EBA01BDF}
 	EndGlobalSection
diff --git a/NuGet.Config b/NuGet.Config
new file mode 100644
index 0000000..4d736c1
--- /dev/null
+++ b/NuGet.Config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>
diff --git a/docker-compose.yml b/docker-compose.yml
index e13f9b0..e08d313 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,4 @@
 # Use root/example as user/password credentials
-version: '3.1'
-
 services:
   db:
     image: mysql
@@ -9,4 +7,4 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: example
     ports:
-      - "3306:3306"
\ No newline at end of file
+      - "3306:3306"
diff --git a/global.json b/global.json
index 5a5a25a..1e7fdfa 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "version": "3.1.416"
+    "version": "10.0.100",
+    "rollForward": "latestMinor"
   }
-}
\ No newline at end of file
+}
diff --git a/src/DotnetToLambda.Api/DotnetToLambda.Api/DotnetToLambda.Api.csproj b/src/DotnetToLambda.Api/DotnetToLambda.Api/DotnetToLambda.Api.csproj
index 00f3e70..1afb89c 100644
--- a/src/DotnetToLambda.Api/DotnetToLambda.Api/DotnetToLambda.Api.csproj
+++ b/src/DotnetToLambda.Api/DotnetToLambda.Api/DotnetToLambda.Api.csproj
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DotnetToLambda.Core\DotnetToLambda.Core.csproj" />
   </ItemGroup>
 
-
 </Project>
diff --git a/src/DotnetToLambda.Api/DotnetToLambda.Api/Program.cs b/src/DotnetToLambda.Api/DotnetToLambda.Api/Program.cs
index f89edf5..03618b6 100644
--- a/src/DotnetToLambda.Api/DotnetToLambda.Api/Program.cs
+++ b/src/DotnetToLambda.Api/DotnetToLambda.Api/Program.cs
@@ -1,26 +1,38 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-
-namespace DotnetToLambda.Api
+using DotnetToLambda.Core.Models;
+using DotnetToLambda.Core.Infrastructure;
+using DotnetToLambda.Core.Services;
+using Microsoft.EntityFrameworkCore;
+
+var builder = WebApplication.CreateBuilder(args);
+
+var databaseConnection =
+    new DatabaseConnection(builder.Configuration.GetConnectionString("DatabaseConnection")!);
+
+builder.Services.AddSingleton(databaseConnection);
+
+builder.Services.AddDbContext<BookingContext>(options =>
+    options.UseMySQL(databaseConnection.ToString()));
+
+builder.Services.AddTransient<IBookingRepository, BookingRepository>();
+builder.Services.AddHttpClient<ICustomerService, CustomerService>();
+
+builder.Services.AddControllers();
+
+var app = builder.Build();
+
+if (app.Environment.IsDevelopment())
+{
+    app.UseDeveloperExceptionPage();
+}
+
+using (var scope = app.Services.CreateScope())
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    var context = scope.ServiceProvider.GetRequiredService<BookingContext>();
+    context.Database.Migrate();
 }
+
+app.UseRouting();
+app.UseAuthorization();
+app.MapControllers();
+
+app.Run();
diff --git a/src/DotnetToLambda.Api/DotnetToLambda.Api/Startup.cs b/src/DotnetToLambda.Api/DotnetToLambda.Api/Startup.cs
deleted file mode 100644
index 5870358..0000000
--- a/src/DotnetToLambda.Api/DotnetToLambda.Api/Startup.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using DotnetToLambda.Core.Models;
-using DotnetToLambda.Core.Infrastructure;
-using DotnetToLambda.Core.Services;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace DotnetToLambda.Api
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            var databaseConnection =
-                new DatabaseConnection(this.Configuration.GetConnectionString("DatabaseConnection"));
-            
-            services.AddSingleton<DatabaseConnection>(databaseConnection);
-            
-            services.AddDbContext<BookingContext>(options =>
-                options.UseMySQL(databaseConnection.ToString()));
-
-            services.AddTransient<IBookingRepository, BookingRepository>();
-            services.AddHttpClient<ICustomerService, CustomerService>();
-            
-            services.AddControllers();
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
-            using (var serviceScope = app.ApplicationServices.CreateScope())
-            {
-                var context = serviceScope.ServiceProvider.GetRequiredService<BookingContext>();
-                context.Database.Migrate();   
-            }
-
-            app.UseRouting();
-
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-            });
-        }
-    }
-}
diff --git a/src/DotnetToLambda.Api/DotnetToLambda.Core/DotnetToLambda.Core.csproj b/src/DotnetToLambda.Api/DotnetToLambda.Core/DotnetToLambda.Core.csproj
index 49196da..fe7545a 100644
--- a/src/DotnetToLambda.Api/DotnetToLambda.Core/DotnetToLambda.Core.csproj
+++ b/src/DotnetToLambda.Api/DotnetToLambda.Core/DotnetToLambda.Core.csproj
@@ -1,19 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.22" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.22" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.22" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.22">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="MySql.EntityFrameworkCore" Version="3.1.19" />
-    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="MySql.EntityFrameworkCore" Version="10.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/DotnetToLambda.Api/DotnetToLambda.Core/Infrastructure/BookingContext.cs b/src/DotnetToLambda.Api/DotnetToLambda.Core/Infrastructure/BookingContext.cs
index 37220a3..ca7b46f 100644
--- a/src/DotnetToLambda.Api/DotnetToLambda.Core/Infrastructure/BookingContext.cs
+++ b/src/DotnetToLambda.Api/DotnetToLambda.Core/Infrastructure/BookingContext.cs
@@ -1,34 +1,32 @@
 using DotnetToLambda.Core.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 
-namespace DotnetToLambda.Core.Infrastructure
+namespace DotnetToLambda.Core.Infrastructure;
+
+public class BookingContext : DbContext
 {
-    public class BookingContext : DbContext
+    private readonly DatabaseConnection _connection;
+
+    public BookingContext(DatabaseConnection connection)
     {
-        private readonly DatabaseConnection _connection;
+        _connection = connection;
+    }
 
-        public BookingContext(DatabaseConnection connection)
-        {
-            this._connection = connection;
-        }
-        
-        public DbSet<Booking> Bookings { get; set; }
+    public DbSet<Booking> Bookings { get; set; } = null!;
 
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            optionsBuilder.UseMySQL(this._connection.ToString());
-        }
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        optionsBuilder.UseMySQL(_connection.ToString());
+    }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            modelBuilder.Entity<Booking>().ToTable("Bookings");
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder.Entity<Booking>().ToTable("Bookings");
 
-            modelBuilder.Entity<Booking>()
-                .HasKey(b => b.BookingId).HasName("PK_BookingId");
-            modelBuilder.Entity<Booking>()
-                .HasIndex(b => b.CustomerId)
-                .HasName("UX_Booking_CustomerId");
-        }
+        modelBuilder.Entity<Booking>()
+            .HasKey(b => b.BookingId).HasName("PK_BookingId");
+        modelBuilder.Entity<Booking>()
+            .HasIndex(b => b.CustomerId)
+            .HasDatabaseName("UX_Booking_CustomerId");
     }
-}
\ No newline at end of file
+}
diff --git a/src/infrastructure/src/Infrastructure/Infrastructure.csproj b/src/infrastructure/src/Infrastructure/Infrastructure.csproj
index f75b87c..b195ccd 100644
--- a/src/infrastructure/src/Infrastructure/Infrastructure.csproj
+++ b/src/infrastructure/src/Infrastructure/Infrastructure.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <!-- Roll forward to future major versions of the netcoreapp as needed -->
-    <RollForward>Major</RollForward>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <!-- CDK Construct Library dependencies -->
-    <PackageReference Include="Amazon.CDK.Lib" Version="2.10.0" />
-    <PackageReference Include="Constructs" Version="[10.0.0,11.0.0)" />
+    <PackageReference Include="Amazon.CDK.Lib" Version="2.250.0" />
+    <PackageReference Include="Constructs" Version="[10.5.0,11.0.0)" />
 
     <!-- jsii Roslyn analyzers (un-comment to obtain compile-time checks for missing required props
     <PackageReference Include="Amazon.Jsii.Analyzers" Version="*" PrivateAssets="all" />
diff --git a/src/infrastructure/src/Infrastructure/InfrastructureStack.cs b/src/infrastructure/src/Infrastructure/InfrastructureStack.cs
index 63983c0..62e8bf0 100644
--- a/src/infrastructure/src/Infrastructure/InfrastructureStack.cs
+++ b/src/infrastructure/src/Infrastructure/InfrastructureStack.cs
@@ -4,105 +4,103 @@
 using Amazon.CDK.AWS.SSM;
 using Constructs;
 
-namespace Infrastructure
+namespace Infrastructure;
+
+public class InfrastructureStack : Stack
 {
-    public class InfrastructureStack : Stack
+    internal InfrastructureStack(Construct scope, string id, IStackProps? props = null) : base(scope, id, props)
     {
-        internal InfrastructureStack(Construct scope, string id, IStackProps props = null) : base(scope, id, props)
+        var vpc = new Vpc(this, "DotnetToLambdaVpc", new VpcProps
         {
-            var vpc = new Vpc(this, "DotnetToLambdaVpc", new VpcProps
-            {
-                Cidr = "10.0.0.0/16",
-                MaxAzs = 2,
-                SubnetConfiguration = new ISubnetConfiguration[]
+            IpAddresses = IpAddresses.Cidr("10.0.0.0/16"),
+            MaxAzs = 2,
+            SubnetConfiguration =
+            [
+                new SubnetConfiguration
+                {
+                    CidrMask = 24,
+                    SubnetType = SubnetType.PUBLIC,
+                    Name = "DotnetToLambdaPublicSubnet"
+                },
+                new SubnetConfiguration
                 {
-                    new SubnetConfiguration
-                    {
-                        CidrMask = 24,
-                        SubnetType = SubnetType.PUBLIC,
-                        Name = "DotnetToLambdaPublicSubnet"
-                    },
-                    new SubnetConfiguration
-                    {
-                        CidrMask = 24,
-                        SubnetType = SubnetType.PRIVATE_ISOLATED,
-                        Name = "DotnetToLambdaPrivateSubnet"
-                    },
-                    new SubnetConfiguration
-                    {
-                        CidrMask = 28,
-                        SubnetType = SubnetType.PRIVATE_WITH_NAT,
-                        Name = "DotnetToLambdaPrivate"
-                    }
+                    CidrMask = 24,
+                    SubnetType = SubnetType.PRIVATE_ISOLATED,
+                    Name = "DotnetToLambdaPrivateSubnet"
                 },
-                NatGateways = 2,
-                EnableDnsHostnames = true,
-                EnableDnsSupport = true,
-            });
+                new SubnetConfiguration
+                {
+                    CidrMask = 28,
+                    SubnetType = SubnetType.PRIVATE_WITH_EGRESS,
+                    Name = "DotnetToLambdaPrivate"
+                }
+            ],
+            NatGateways = 2,
+            EnableDnsHostnames = true,
+            EnableDnsSupport = true,
+        });
 
-            const int dbPort = 3306;
+        const int dbPort = 3306;
 
-            var db = new DatabaseInstance(this, "DB", new DatabaseInstanceProps
+        var db = new DatabaseInstance(this, "DB", new DatabaseInstanceProps
+        {
+            Vpc = vpc,
+            VpcSubnets = new SubnetSelection { SubnetType = SubnetType.PRIVATE_ISOLATED },
+            Engine = DatabaseInstanceEngine.Mysql(new MySqlInstanceEngineProps
             {
-                Vpc = vpc,
-                VpcSubnets = new SubnetSelection {SubnetType = SubnetType.PRIVATE_ISOLATED},
-                Engine = DatabaseInstanceEngine.Mysql(new MySqlInstanceEngineProps()
-                {
-                    Version = MysqlEngineVersion.VER_8_0_26
-                }),
-                InstanceType = InstanceType.Of(InstanceClass.BURSTABLE2, InstanceSize.MICRO),
-                Port = dbPort,
-                InstanceIdentifier = "DotnetToLambda",
-                BackupRetention = Duration.Seconds(0)
-            });
+                Version = MysqlEngineVersion.VER_8_4_4
+            }),
+            InstanceType = Amazon.CDK.AWS.EC2.InstanceType.Of(InstanceClass.BURSTABLE4_GRAVITON, InstanceSize.MICRO),
+            Port = dbPort,
+            InstanceIdentifier = "DotnetToLambda",
+            BackupRetention = Duration.Seconds(0)
+        });
 
-            var privateSubnets = vpc.SelectSubnets(new SubnetSelection()
-            {
-                SubnetType = SubnetType.PRIVATE_ISOLATED
-            });
-            
-            var natEnabledPrivateSubnets = vpc.SelectSubnets(new SubnetSelection()
-            {
-                SubnetType = SubnetType.PRIVATE_WITH_NAT
-            });
+        var privateSubnets = vpc.SelectSubnets(new SubnetSelection
+        {
+            SubnetType = SubnetType.PRIVATE_ISOLATED
+        });
+
+        var natEnabledPrivateSubnets = vpc.SelectSubnets(new SubnetSelection
+        {
+            SubnetType = SubnetType.PRIVATE_WITH_EGRESS
+        });
 
-            var dbSecurityGroup = db.Connections.SecurityGroups[0];
+        var dbSecurityGroup = db.Connections.SecurityGroups[0];
 
-            dbSecurityGroup.AddIngressRule(Peer.Ipv4(vpc.VpcCidrBlock), Port.Tcp(dbPort));
+        dbSecurityGroup.AddIngressRule(Peer.Ipv4(vpc.VpcCidrBlock), Port.Tcp(dbPort));
 
-            var parameter = new StringParameter(this, "dev-configuration", new StringParameterProps()
-            {
-                ParameterName = "dotnet-to-lambda-dev",
-                StringValue = "{\"CustomerApiEndpoint\": \"https://jsonplaceholder.typicode.com/users\"}",
-                DataType = ParameterDataType.TEXT,
-                Tier = ParameterTier.STANDARD,
-                Type = ParameterType.STRING,
-                Description = "Dev configuration for dotnet to lambda",
-            });
+        var parameter = new StringParameter(this, "dev-configuration", new StringParameterProps
+        {
+            ParameterName = "dotnet-to-lambda-dev",
+            StringValue = "{\"CustomerApiEndpoint\": \"https://jsonplaceholder.typicode.com/users\"}",
+            DataType = ParameterDataType.TEXT,
+            Tier = ParameterTier.STANDARD,
+            Description = "Dev configuration for dotnet to lambda",
+        });
 
-            var subnet1 = new CfnOutput(this, "PrivateSubnet1", new CfnOutputProps()
-            {
-                ExportName = "PrivateSubnet1",
-                Value = natEnabledPrivateSubnets.SubnetIds[0]
-            });
+        _ = new CfnOutput(this, "PrivateSubnet1", new CfnOutputProps
+        {
+            ExportName = "PrivateSubnet1",
+            Value = natEnabledPrivateSubnets.SubnetIds[0]
+        });
 
-            var subnet2 = new CfnOutput(this, "PrivateSubnet2", new CfnOutputProps()
-            {
-                ExportName = "PrivateSubnet2",
-                Value = natEnabledPrivateSubnets.SubnetIds[1]
-            });
+        _ = new CfnOutput(this, "PrivateSubnet2", new CfnOutputProps
+        {
+            ExportName = "PrivateSubnet2",
+            Value = natEnabledPrivateSubnets.SubnetIds[1]
+        });
 
-            var dbSecurityGroupOutput = new CfnOutput(this, "SecurityGroup", new CfnOutputProps()
-            {
-                ExportName = "DbSecurityGroup",
-                Value = dbSecurityGroup.SecurityGroupId
-            });
+        _ = new CfnOutput(this, "SecurityGroup", new CfnOutputProps
+        {
+            ExportName = "DbSecurityGroup",
+            Value = dbSecurityGroup.SecurityGroupId
+        });
 
-            var secretManager = new CfnOutput(this, "SecretArn", new CfnOutputProps()
-            {
-                ExportName = "DbConnectionStringSecret",
-                Value = db.Secret.SecretArn
-            });
-        }
+        _ = new CfnOutput(this, "SecretArn", new CfnOutputProps
+        {
+            ExportName = "DbConnectionStringSecret",
+            Value = db.Secret!.SecretArn
+        });
     }
-}
\ No newline at end of file
+}
diff --git a/src/infrastructure/src/Infrastructure/Program.cs b/src/infrastructure/src/Infrastructure/Program.cs
index 9690290..d0f3fa8 100644
--- a/src/infrastructure/src/Infrastructure/Program.cs
+++ b/src/infrastructure/src/Infrastructure/Program.cs
@@ -1,44 +1,40 @@
 using Amazon.CDK;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
-namespace Infrastructure
+namespace Infrastructure;
+
+sealed class Program
 {
-    sealed class Program
+    public static void Main(string[] args)
     {
-        public static void Main(string[] args)
+        var app = new App();
+        new InfrastructureStack(app, "InfrastructureStack", new StackProps
         {
-            var app = new App();
-            new InfrastructureStack(app, "InfrastructureStack", new StackProps
-            {
-                // If you don't specify 'env', this stack will be environment-agnostic.
-                // Account/Region-dependent features and context lookups will not work,
-                // but a single synthesized template can be deployed anywhere.
+            // If you don't specify 'env', this stack will be environment-agnostic.
+            // Account/Region-dependent features and context lookups will not work,
+            // but a single synthesized template can be deployed anywhere.
 
-                // Uncomment the next block to specialize this stack for the AWS Account
-                // and Region that are implied by the current CLI configuration.
-                /*
-                Env = new Amazon.CDK.Environment
-                {
-                    Account = System.Environment.GetEnvironmentVariable("CDK_DEFAULT_ACCOUNT"),
-                    Region = System.Environment.GetEnvironmentVariable("CDK_DEFAULT_REGION"),
-                }
-                */
+            // Uncomment the next block to specialize this stack for the AWS Account
+            // and Region that are implied by the current CLI configuration.
+            /*
+            Env = new Amazon.CDK.Environment
+            {
+                Account = System.Environment.GetEnvironmentVariable("CDK_DEFAULT_ACCOUNT"),
+                Region = System.Environment.GetEnvironmentVariable("CDK_DEFAULT_REGION"),
+            }
+            */
 
-                // Uncomment the next block if you know exactly what Account and Region you
-                // want to deploy the stack to.
-                /*
-                Env = new Amazon.CDK.Environment
-                {
-                    Account = "123456789012",
-                    Region = "us-east-1",
-                }
-                */
+            // Uncomment the next block if you know exactly what Account and Region you
+            // want to deploy the stack to.
+            /*
+            Env = new Amazon.CDK.Environment
+            {
+                Account = "123456789012",
+                Region = "us-east-1",
+            }
+            */
 
-                // For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html
-            });
-            app.Synth();
-        }
+            // For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html
+        });
+        app.Synth();
     }
 }
diff --git a/src/serverless/DotnetToLambda.Serverless.Config/DotnetToLambda.Serverless.Config.csproj b/src/serverless/DotnetToLambda.Serverless.Config/DotnetToLambda.Serverless.Config.csproj
index 9bf0d34..84f91d9 100644
--- a/src/serverless/DotnetToLambda.Serverless.Config/DotnetToLambda.Serverless.Config.csproj
+++ b/src/serverless/DotnetToLambda.Serverless.Config/DotnetToLambda.Serverless.Config.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.AppConfig" Version="3.7.1.19" />
-    <PackageReference Include="AWSSDK.SecretsManager" Version="3.7.2" />
-	<PackageReference Include="Amazon.Lambda.Logging.AspNetCore" Version="3.0.1" />
-	<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.12.6" />
-	<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.22" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.22" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.22" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.22" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="AWSSDK.AppConfig" Version="4.0.2.4" />
+    <PackageReference Include="AWSSDK.SecretsManager" Version="4.0.4.4" />
+    <PackageReference Include="Amazon.Lambda.Logging.AspNetCore" Version="3.0.1" />
+    <PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="4.0.7.11" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/serverless/DotnetToLambda.Serverless/src/ApplyDatabaseMigrations/ApplyDatabaseMigrations.csproj b/src/serverless/DotnetToLambda.Serverless/src/ApplyDatabaseMigrations/ApplyDatabaseMigrations.csproj
index 5cda394..efd5c33 100644
--- a/src/serverless/DotnetToLambda.Serverless/src/ApplyDatabaseMigrations/ApplyDatabaseMigrations.csproj
+++ b/src/serverless/DotnetToLambda.Serverless/src/ApplyDatabaseMigrations/ApplyDatabaseMigrations.csproj
@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.Core" Version="2.0.0" />
-    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.4.0" />
-    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.1.0" />
+    <PackageReference Include="Amazon.Lambda.Core" Version="2.7.1" />
+    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
+    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/serverless/DotnetToLambda.Serverless/src/ApplyDatabaseMigrations/aws-lambda-tools-defaults.json b/src/serverless/DotnetToLambda.Serverless/src/ApplyDatabaseMigrations/aws-lambda-tools-defaults.json
index 6d13cfa..b97734c 100644
--- a/src/serverless/DotnetToLambda.Serverless/src/ApplyDatabaseMigrations/aws-lambda-tools-defaults.json
+++ b/src/serverless/DotnetToLambda.Serverless/src/ApplyDatabaseMigrations/aws-lambda-tools-defaults.json
@@ -11,8 +11,8 @@
   "profile":"",
   "region" : "",
   "configuration": "Release",
-  "framework" : "netcoreapp3.1",
-  "function-runtime":"dotnetcore3.1",
+  "framework" : "net10.0",
+  "function-runtime":"dotnet10",
   "function-memory-size" : 256,
   "function-timeout" : 30,
   "function-handler" : "HelloWorld::HelloWorld.Function::FunctionHandler"
diff --git a/src/serverless/DotnetToLambda.Serverless/src/CancelBooking/CancelBooking.csproj b/src/serverless/DotnetToLambda.Serverless/src/CancelBooking/CancelBooking.csproj
index 5cda394..efd5c33 100644
--- a/src/serverless/DotnetToLambda.Serverless/src/CancelBooking/CancelBooking.csproj
+++ b/src/serverless/DotnetToLambda.Serverless/src/CancelBooking/CancelBooking.csproj
@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.Core" Version="2.0.0" />
-    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.4.0" />
-    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.1.0" />
+    <PackageReference Include="Amazon.Lambda.Core" Version="2.7.1" />
+    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
+    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/serverless/DotnetToLambda.Serverless/src/CancelBooking/aws-lambda-tools-defaults.json b/src/serverless/DotnetToLambda.Serverless/src/CancelBooking/aws-lambda-tools-defaults.json
index 6d13cfa..b97734c 100644
--- a/src/serverless/DotnetToLambda.Serverless/src/CancelBooking/aws-lambda-tools-defaults.json
+++ b/src/serverless/DotnetToLambda.Serverless/src/CancelBooking/aws-lambda-tools-defaults.json
@@ -11,8 +11,8 @@
   "profile":"",
   "region" : "",
   "configuration": "Release",
-  "framework" : "netcoreapp3.1",
-  "function-runtime":"dotnetcore3.1",
+  "framework" : "net10.0",
+  "function-runtime":"dotnet10",
   "function-memory-size" : 256,
   "function-timeout" : 30,
   "function-handler" : "HelloWorld::HelloWorld.Function::FunctionHandler"
diff --git a/src/serverless/DotnetToLambda.Serverless/src/ConfirmBooking/ConfirmBooking.csproj b/src/serverless/DotnetToLambda.Serverless/src/ConfirmBooking/ConfirmBooking.csproj
index 5cda394..efd5c33 100644
--- a/src/serverless/DotnetToLambda.Serverless/src/ConfirmBooking/ConfirmBooking.csproj
+++ b/src/serverless/DotnetToLambda.Serverless/src/ConfirmBooking/ConfirmBooking.csproj
@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.Core" Version="2.0.0" />
-    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.4.0" />
-    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.1.0" />
+    <PackageReference Include="Amazon.Lambda.Core" Version="2.7.1" />
+    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
+    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/serverless/DotnetToLambda.Serverless/src/ConfirmBooking/aws-lambda-tools-defaults.json b/src/serverless/DotnetToLambda.Serverless/src/ConfirmBooking/aws-lambda-tools-defaults.json
index 6d13cfa..b97734c 100644
--- a/src/serverless/DotnetToLambda.Serverless/src/ConfirmBooking/aws-lambda-tools-defaults.json
+++ b/src/serverless/DotnetToLambda.Serverless/src/ConfirmBooking/aws-lambda-tools-defaults.json
@@ -11,8 +11,8 @@
   "profile":"",
   "region" : "",
   "configuration": "Release",
-  "framework" : "netcoreapp3.1",
-  "function-runtime":"dotnetcore3.1",
+  "framework" : "net10.0",
+  "function-runtime":"dotnet10",
   "function-memory-size" : 256,
   "function-timeout" : 30,
   "function-handler" : "HelloWorld::HelloWorld.Function::FunctionHandler"
diff --git a/src/serverless/DotnetToLambda.Serverless/src/ListForCustomer/ListForCustomer.csproj b/src/serverless/DotnetToLambda.Serverless/src/ListForCustomer/ListForCustomer.csproj
index 5cda394..efd5c33 100644
--- a/src/serverless/DotnetToLambda.Serverless/src/ListForCustomer/ListForCustomer.csproj
+++ b/src/serverless/DotnetToLambda.Serverless/src/ListForCustomer/ListForCustomer.csproj
@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.Core" Version="2.0.0" />
-    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.4.0" />
-    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.1.0" />
+    <PackageReference Include="Amazon.Lambda.Core" Version="2.7.1" />
+    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
+    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/serverless/DotnetToLambda.Serverless/src/ListForCustomer/aws-lambda-tools-defaults.json b/src/serverless/DotnetToLambda.Serverless/src/ListForCustomer/aws-lambda-tools-defaults.json
index 6d13cfa..b97734c 100644
--- a/src/serverless/DotnetToLambda.Serverless/src/ListForCustomer/aws-lambda-tools-defaults.json
+++ b/src/serverless/DotnetToLambda.Serverless/src/ListForCustomer/aws-lambda-tools-defaults.json
@@ -11,8 +11,8 @@
   "profile":"",
   "region" : "",
   "configuration": "Release",
-  "framework" : "netcoreapp3.1",
-  "function-runtime":"dotnetcore3.1",
+  "framework" : "net10.0",
+  "function-runtime":"dotnet10",
   "function-memory-size" : 256,
   "function-timeout" : 30,
   "function-handler" : "HelloWorld::HelloWorld.Function::FunctionHandler"
diff --git a/src/serverless/DotnetToLambda.Serverless/src/ReserveBooking/ReserveBooking.csproj b/src/serverless/DotnetToLambda.Serverless/src/ReserveBooking/ReserveBooking.csproj
index 5cda394..efd5c33 100644
--- a/src/serverless/DotnetToLambda.Serverless/src/ReserveBooking/ReserveBooking.csproj
+++ b/src/serverless/DotnetToLambda.Serverless/src/ReserveBooking/ReserveBooking.csproj
@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.Core" Version="2.0.0" />
-    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.4.0" />
-    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.1.0" />
+    <PackageReference Include="Amazon.Lambda.Core" Version="2.7.1" />
+    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
+    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/serverless/DotnetToLambda.Serverless/src/ReserveBooking/aws-lambda-tools-defaults.json b/src/serverless/DotnetToLambda.Serverless/src/ReserveBooking/aws-lambda-tools-defaults.json
index 6d13cfa..b97734c 100644
--- a/src/serverless/DotnetToLambda.Serverless/src/ReserveBooking/aws-lambda-tools-defaults.json
+++ b/src/serverless/DotnetToLambda.Serverless/src/ReserveBooking/aws-lambda-tools-defaults.json
@@ -11,8 +11,8 @@
   "profile":"",
   "region" : "",
   "configuration": "Release",
-  "framework" : "netcoreapp3.1",
-  "function-runtime":"dotnetcore3.1",
+  "framework" : "net10.0",
+  "function-runtime":"dotnet10",
   "function-memory-size" : 256,
   "function-timeout" : 30,
   "function-handler" : "HelloWorld::HelloWorld.Function::FunctionHandler"
diff --git a/src/serverless/DotnetToLambda.Serverless/src/Retrieve/Retrieve.csproj b/src/serverless/DotnetToLambda.Serverless/src/Retrieve/Retrieve.csproj
index 5cda394..efd5c33 100644
--- a/src/serverless/DotnetToLambda.Serverless/src/Retrieve/Retrieve.csproj
+++ b/src/serverless/DotnetToLambda.Serverless/src/Retrieve/Retrieve.csproj
@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.Core" Version="2.0.0" />
-    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.4.0" />
-    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.1.0" />
+    <PackageReference Include="Amazon.Lambda.Core" Version="2.7.1" />
+    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
+    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/serverless/DotnetToLambda.Serverless/src/Retrieve/aws-lambda-tools-defaults.json b/src/serverless/DotnetToLambda.Serverless/src/Retrieve/aws-lambda-tools-defaults.json
index 6d13cfa..b97734c 100644
--- a/src/serverless/DotnetToLambda.Serverless/src/Retrieve/aws-lambda-tools-defaults.json
+++ b/src/serverless/DotnetToLambda.Serverless/src/Retrieve/aws-lambda-tools-defaults.json
@@ -11,8 +11,8 @@
   "profile":"",
   "region" : "",
   "configuration": "Release",
-  "framework" : "netcoreapp3.1",
-  "function-runtime":"dotnetcore3.1",
+  "framework" : "net10.0",
+  "function-runtime":"dotnet10",
   "function-memory-size" : 256,
   "function-timeout" : 30,
   "function-handler" : "HelloWorld::HelloWorld.Function::FunctionHandler"
diff --git a/src/serverless/DotnetToLambda.Serverless/template.yaml b/src/serverless/DotnetToLambda.Serverless/template.yaml
index c84afbd..c79a5ba 100644
--- a/src/serverless/DotnetToLambda.Serverless/template.yaml
+++ b/src/serverless/DotnetToLambda.Serverless/template.yaml
@@ -4,7 +4,7 @@ Transform: AWS::Serverless-2016-10-31
 Globals:
   Function:
     Timeout: 30
-    Runtime: dotnetcore3.1
+    Runtime: dotnet10
     Architectures:
       - x86_64
     MemorySize: 256