Update Lambda blueprints for .NET 8 (#1673)

aws · Feb 20, 2024 · a4007ba · a4007ba
1 parent d741998
commit a4007ba
Show file tree

Hide file tree

Showing 220 changed files with 718 additions and 671 deletions.
diff --git a/...s/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj b/...s/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -14,8 +14,8 @@
   <ItemGroup>
     <PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
     <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
-    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
-    <PackageReference Include="Amazon.Lambda.Annotations" Version="1.0.0" />
+    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.1" />
+    <PackageReference Include="Amazon.Lambda.Annotations" Version="1.2.0" />
   </ItemGroup>
   <!-- 
     The FrameworkReference is used to reduce the deployment bundle size by not having to include 

diff --git a/...rintDefinitions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/Functions.cs b/...rintDefinitions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/Functions.cs
@@ -49,8 +49,8 @@ public string Default()
     /// <summary>
     /// Perform x + y
     /// </summary>
-    /// <param name="x"></param>
-    /// <param name="y"></param>
+    /// <param name="x">Left hand operand of the arithmetic operation.</param>
+    /// <param name="y">Right hand operand of the arithmetic operation.</param>
     /// <returns>Sum of x and y.</returns>
     [LambdaFunction()]
     [HttpApi(LambdaHttpMethod.Get, "/add/{x}/{y}")]
@@ -65,8 +65,8 @@ public int Add(int x, int y, ILambdaContext context)
     /// <summary>
     /// Perform x - y.
     /// </summary>
-    /// <param name="x"></param>
-    /// <param name="y"></param>
+    /// <param name="x">Left hand operand of the arithmetic operation.</param>
+    /// <param name="y">Right hand operand of the arithmetic operation.</param>
     /// <returns>x subtract y</returns>
     [LambdaFunction()]
     [HttpApi(LambdaHttpMethod.Get, "/subtract/{x}/{y}")]
@@ -81,8 +81,8 @@ public int Subtract(int x, int y, ILambdaContext context)
     /// <summary>
     /// Perform x * y.
     /// </summary>
-    /// <param name="x"></param>
-    /// <param name="y"></param>
+    /// <param name="x">Left hand operand of the arithmetic operation.</param>
+    /// <param name="y">Right hand operand of the arithmetic operation.</param>
     /// <returns>x multiply y</returns>
     [LambdaFunction()]
     [HttpApi(LambdaHttpMethod.Get, "/multiply/{x}/{y}")]
@@ -97,8 +97,8 @@ public int Multiply(int x, int y, ILambdaContext context)
     /// <summary>
     /// Perform x / y.
     /// </summary>
-    /// <param name="x"></param>
-    /// <param name="y"></param>
+    /// <param name="x">Left hand operand of the arithmetic operation.</param>
+    /// <param name="y">Right hand operand of the arithmetic operation.</param>
     /// <returns>x divide y</returns>
     [LambdaFunction()]
     [HttpApi(LambdaHttpMethod.Get, "/divide/{x}/{y}")]

diff --git a/...initions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/Readme.md b/...initions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/Readme.md
@@ -226,7 +226,7 @@ remove the `Tool` metadata property.
         ]
     },
     "Properties": {
-    "Runtime": "dotnet6",
+    "Runtime": "dotnet8",
     "CodeUri": ".",
 
   ...
@@ -271,7 +271,7 @@ public class Functions
         ]
       },
       "Properties": {
-        "Runtime": "dotnet6",
+        "Runtime": "dotnet8",
 
 ...
         "Role": {
@@ -424,9 +424,9 @@ The `HttpApi` attribute also adds the API Gateway event source.
         ]
       },
       "Properties": {
-        "Runtime": "dotnet6",
+        "Runtime": "dotnet8",
         "CodeUri": ".",
-        "MemorySize": 256,
+        "MemorySize": 512,
         "Timeout": 30,
         "PackageType": "Zip",
         "Handler": "CloudCalculator::CloudCalculator.Functions_Add_Generated::Add",
@@ -615,7 +615,7 @@ In this example the function is modified to define the event source in this case
         "Tool": "Amazon.Lambda.Annotations"
       },
       "Properties": {
-        "Runtime": "dotnet6",
+        "Runtime": "dotnet8",
         "CodeUri": ".",
         "MemorySize": 1024,
         "Timeout": 120,

diff --git a/...initions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/serverless.template b/...initions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/serverless.template
@@ -1,7 +1,7 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
   "Transform": "AWS::Serverless-2016-10-31",
-  "Description": "An AWS Serverless Application.",
+  "Description": "An AWS Serverless Application. This template is partially managed by Amazon.Lambda.Annotations (v1.2.0.0).",
   "Resources": {
     "BlueprintBaseName1FunctionsDefaultGenerated": {
       "Type": "AWS::Serverless::Function",
@@ -12,9 +12,9 @@
         ]
       },
       "Properties": {
-        "Runtime": "dotnet6",
+        "Runtime": "dotnet8",
         "CodeUri": ".",
-        "MemorySize": 256,
+        "MemorySize": 512,
         "Timeout": 30,
         "Policies": [
           "AWSLambdaBasicExecutionRole"
@@ -41,9 +41,9 @@
         ]
       },
       "Properties": {
-        "Runtime": "dotnet6",
+        "Runtime": "dotnet8",
         "CodeUri": ".",
-        "MemorySize": 256,
+        "MemorySize": 512,
         "Timeout": 30,
         "Policies": [
           "AWSLambdaBasicExecutionRole"
@@ -70,9 +70,9 @@
         ]
       },
       "Properties": {
-        "Runtime": "dotnet6",
+        "Runtime": "dotnet8",
         "CodeUri": ".",
-        "MemorySize": 256,
+        "MemorySize": 512,
         "Timeout": 30,
         "Policies": [
           "AWSLambdaBasicExecutionRole"
@@ -99,9 +99,9 @@
         ]
       },
       "Properties": {
-        "Runtime": "dotnet6",
+        "Runtime": "dotnet8",
         "CodeUri": ".",
-        "MemorySize": 256,
+        "MemorySize": 512,
         "Timeout": 30,
         "Policies": [
           "AWSLambdaBasicExecutionRole"
@@ -128,9 +128,9 @@
         ]
       },
       "Properties": {
-        "Runtime": "dotnet6",
+        "Runtime": "dotnet8",
         "CodeUri": ".",
-        "MemorySize": 256,
+        "MemorySize": 512,
         "Timeout": 30,
         "Policies": [
           "AWSLambdaBasicExecutionRole"

diff --git a/...tationsFramework/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.csproj b/...tationsFramework/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsTestProject>true</IsTestProject>

diff --git a/...s2022/AspNetCoreWebAPI-FSharp/template/src/BlueprintBaseName.1/BlueprintBaseName.1.fsproj b/...s2022/AspNetCoreWebAPI-FSharp/template/src/BlueprintBaseName.1/BlueprintBaseName.1.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <AWSProjectType>Lambda</AWSProjectType>
     <!-- This property makes the build directory similar to a publish directory and helps the AWS .NET Lambda Mock Test Tool find project dependencies. -->
@@ -18,6 +18,6 @@
     <None Include="serverless.template" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="8.1.0" />
+    <PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="9.0.0" />
   </ItemGroup>
 </Project>
diff --git a/...tions/vs2022/AspNetCoreWebAPI-FSharp/template/src/BlueprintBaseName.1/serverless.template b/...tions/vs2022/AspNetCoreWebAPI-FSharp/template/src/BlueprintBaseName.1/serverless.template
@@ -8,9 +8,9 @@
       "Type": "AWS::Serverless::Function",
       "Properties": {
         "Handler": "BlueprintBaseName.1::BlueprintBaseName._1.LambdaEntryPoint::FunctionHandlerAsync",
-        "Runtime": "dotnet6",
+        "Runtime": "dotnet8",
         "CodeUri": "",
-        "MemorySize": 256,
+        "MemorySize": 512,
         "Timeout": 30,
         "Role": null,
         "Policies": [

diff --git a/...oreWebAPI-FSharp/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.fsproj b/...oreWebAPI-FSharp/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <IsPackable>false</IsPackable>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <EnableDefaultContentItems>False</EnableDefaultContentItems>
   </PropertyGroup>
   <ItemGroup>

diff --git a/...tDefinitions/vs2022/AspNetCoreWebAPI-Image-FSharp/template/.template.config/template.json b/...tDefinitions/vs2022/AspNetCoreWebAPI-Image-FSharp/template/.template.config/template.json
@@ -6,7 +6,7 @@
     "Lambda",
     "Serverless"
   ],
-  "name": "Lambda ASP.NET Core Web API (.NET 6 Container Image)",
+  "name": "Lambda ASP.NET Core Web API (.NET 8 Container Image)",
   "identity": "AWS.Lambda.Serverless.Image.AspNetCoreWebAPI.FSharp",
   "groupIdentity": "AWS.Lambda.Serverless.Image.AspNetCoreWebAPI",
   "shortName": "serverless.image.AspNetCoreWebAPI",

diff --git a/...AspNetCoreWebAPI-Image-FSharp/template/src/BlueprintBaseName.1/BlueprintBaseName.1.fsproj b/...AspNetCoreWebAPI-Image-FSharp/template/src/BlueprintBaseName.1/BlueprintBaseName.1.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <AWSProjectType>Lambda</AWSProjectType>
     <!-- This property makes the build directory similar to a publish directory and helps the AWS .NET Lambda Mock Test Tool find project dependencies. -->
@@ -18,6 +18,6 @@
     <None Include="serverless.template" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="8.1.0" />
+    <PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="9.0.0" />
   </ItemGroup>
 </Project>
diff --git a/...initions/vs2022/AspNetCoreWebAPI-Image-FSharp/template/src/BlueprintBaseName.1/Dockerfile b/...initions/vs2022/AspNetCoreWebAPI-Image-FSharp/template/src/BlueprintBaseName.1/Dockerfile
@@ -1,5 +1,4 @@
-FROM public.ecr.aws/lambda/dotnet:7
-
+FROM public.ecr.aws/lambda/dotnet:8
 WORKDIR /var/task
 
 # This COPY command copies the .NET Lambda project's build artifacts from the host machine into the image. 

diff --git a/...vs2022/AspNetCoreWebAPI-Image-FSharp/template/src/BlueprintBaseName.1/Readme.md b/...vs2022/AspNetCoreWebAPI-Image-FSharp/template/src/BlueprintBaseName.1/Readme.md
@@ -44,9 +44,9 @@ Alternatively the Docker file could be written to use [multi-stage](https://docs
 have the .NET project built inside the container. Below is an example of building the .NET project inside the image.
 
 ```dockerfile
-FROM public.ecr.aws/lambda/dotnet:7 AS base
+FROM public.ecr.aws/lambda/dotnet:8 AS base
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim as build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 as build
 WORKDIR /src
 COPY ["BlueprintBaseName.1.csproj", "BlueprintBaseName.1/"]
 RUN dotnet restore "BlueprintBaseName.1/BlueprintBaseName.1.csproj"

diff --git a/...vs2022/AspNetCoreWebAPI-Image-FSharp/template/src/BlueprintBaseName.1/serverless.template b/...vs2022/AspNetCoreWebAPI-Image-FSharp/template/src/BlueprintBaseName.1/serverless.template
@@ -14,7 +14,7 @@
           ]
         },
         "ImageUri": "",
-        "MemorySize": 256,
+        "MemorySize": 512,
         "Timeout": 30,
         "Role": null,
         "Policies": [

diff --git a/...API-Image-FSharp/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.fsproj b/...API-Image-FSharp/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <IsPackable>false</IsPackable>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <EnableDefaultContentItems>False</EnableDefaultContentItems>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Blueprints/BlueprintDefinitions/vs2022/AspNetCoreWebAPI-Image/blueprint-manifest.json b/Blueprints/BlueprintDefinitions/vs2022/AspNetCoreWebAPI-Image/blueprint-manifest.json
@@ -1,7 +1,7 @@
 {
-  "display-name": "ASP.NET Core 7 (Container Image)",
+  "display-name": "ASP.NET Core 8 (Container Image)",
   "system-name": "AspNetCoreWebAPIImage",
-  "description": "Serverless ASP.NET Core 7 Web API packaged as a container image.",
+  "description": "Serverless ASP.NET Core 8 Web API packaged as a container image.",
   "sort-order": 250,
   "hidden-tags": [
     "C#",

diff --git a/...lueprintDefinitions/vs2022/AspNetCoreWebAPI-Image/template/.template.config/template.json b/...lueprintDefinitions/vs2022/AspNetCoreWebAPI-Image/template/.template.config/template.json
@@ -6,7 +6,7 @@
     "Lambda",
     "Serverless"
   ],
-  "name": "Lambda ASP.NET Core Web API (.NET 6 Container Image)",
+  "name": "Lambda ASP.NET Core Web API (.NET 8 Container Image)",
   "identity": "AWS.Lambda.Serverless.Image.AspNetCoreWebAPI.CSharp",
   "groupIdentity": "AWS.Lambda.Serverless.Image.AspNetCoreWebAPI",
   "shortName": "serverless.image.AspNetCoreWebAPI",

diff --git a/...vs2022/AspNetCoreWebAPI-Image/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj b/...vs2022/AspNetCoreWebAPI-Image/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -12,6 +12,6 @@
     <PublishReadyToRun>true</PublishReadyToRun>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="8.1.0" />
+    <PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="9.0.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...rintDefinitions/vs2022/AspNetCoreWebAPI-Image/template/src/BlueprintBaseName.1/Dockerfile b/...rintDefinitions/vs2022/AspNetCoreWebAPI-Image/template/src/BlueprintBaseName.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/lambda/dotnet:7
+FROM public.ecr.aws/lambda/dotnet:8
 
 WORKDIR /var/task
 

diff --git a/...itions/vs2022/AspNetCoreWebAPI-Image/template/src/BlueprintBaseName.1/LambdaEntryPoint.cs b/...itions/vs2022/AspNetCoreWebAPI-Image/template/src/BlueprintBaseName.1/LambdaEntryPoint.cs
@@ -25,7 +25,7 @@ public class LambdaEntryPoint :
     /// The builder has configuration, logging and Amazon API Gateway already configured. The startup class
     /// needs to be configured in this method using the UseStartup<>() method.
     /// </summary>
-    /// <param name="builder"></param>
+    /// <param name="builder">The IWebHostBuilder to configure.</param>
     protected override void Init(IWebHostBuilder builder)
     {
         builder
@@ -38,7 +38,7 @@ protected override void Init(IWebHostBuilder builder)
     /// It is recommended not to call ConfigureWebHostDefaults to configure the IWebHostBuilder inside this method.
     /// Instead customize the IWebHostBuilder in the Init(IWebHostBuilder) overload.
     /// </summary>
-    /// <param name="builder"></param>
+    /// <param name="builder">The IHostBuilder to configure.</param>
     protected override void Init(IHostBuilder builder)
     {
     }

diff --git a/...itions/vs2022/AspNetCoreWebAPI-Image/template/src/BlueprintBaseName.1/Readme.md b/...itions/vs2022/AspNetCoreWebAPI-Image/template/src/BlueprintBaseName.1/Readme.md
@@ -51,9 +51,8 @@ Alternatively the Docker file could be written to use [multi-stage](https://docs
 have the .NET project built inside the container. Below is an example of building the .NET project inside the image.
 
 ```dockerfile
-FROM public.ecr.aws/lambda/dotnet:7 AS base
-
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim as build
+FROM public.ecr.aws/lambda/dotnet:8
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim as build
 WORKDIR /src
 COPY ["BlueprintBaseName.1.csproj", "BlueprintBaseName.1/"]
 RUN dotnet restore "BlueprintBaseName.1/BlueprintBaseName.1.csproj"

diff --git a/...itions/vs2022/AspNetCoreWebAPI-Image/template/src/BlueprintBaseName.1/serverless.template b/...itions/vs2022/AspNetCoreWebAPI-Image/template/src/BlueprintBaseName.1/serverless.template
@@ -15,7 +15,7 @@
           ]
         },
         "ImageUri": "",
-        "MemorySize": 256,
+        "MemorySize": 512,
         "Timeout": 30,
         "Role": null,
         "Policies": [

diff --git a/...CoreWebAPI-Image/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.csproj b/...CoreWebAPI-Image/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsTestProject>true</IsTestProject>

diff --git a/...2/AspNetCoreWebAPI.MinimalAPI/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj b/...2/AspNetCoreWebAPI.MinimalAPI/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -11,6 +11,6 @@
     <PublishReadyToRun>true</PublishReadyToRun>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.AspNetCoreServer.Hosting" Version="1.6.0" />
+    <PackageReference Include="Amazon.Lambda.AspNetCoreServer.Hosting" Version="1.7.0" />
   </ItemGroup>
 </Project>