From 863065d467b44e445541efb722b85e3c9817474d Mon Sep 17 00:00:00 2001 From: Stuart Lang Date: Mon, 18 Nov 2024 13:34:02 +0000 Subject: [PATCH 1/2] Update the al2023 dotnet lambda to dotnet9 --- .github/dependabot.yml | 2 +- README.md | 2 +- lambda-perf.sln | 76 +++++++++++++++++++ manifest.json | 4 +- .../Dockerfile | 0 .../build.sh | 4 +- .../src/Function.cs | 0 .../src/LambdaPerf.csproj | 6 +- .../src/aws-lambda-tools-defaults.json | 2 +- 9 files changed, 86 insertions(+), 10 deletions(-) create mode 100644 lambda-perf.sln rename s3-uploader/runtimes/{dotnet8_aot_on_provided_al2023 => dotnet9_aot_on_provided_al2023}/Dockerfile (100%) rename s3-uploader/runtimes/{dotnet8_aot_on_provided_al2023 => dotnet9_aot_on_provided_al2023}/build.sh (80%) rename s3-uploader/runtimes/{dotnet8_aot_on_provided_al2023 => dotnet9_aot_on_provided_al2023}/src/Function.cs (100%) rename s3-uploader/runtimes/{dotnet8_aot_on_provided_al2023 => dotnet9_aot_on_provided_al2023}/src/LambdaPerf.csproj (84%) rename s3-uploader/runtimes/{dotnet8_aot_on_provided_al2023 => dotnet9_aot_on_provided_al2023}/src/aws-lambda-tools-defaults.json (89%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0a09971f80..76213af997 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -48,7 +48,7 @@ updates: schedule: interval: "daily" - package-ecosystem: "nuget" - directory: "s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/src" + directory: "s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/src" schedule: interval: "daily" - package-ecosystem: "gomod" diff --git a/README.md b/README.md index 1a8f3d692a..ce73917b16 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ in addition to the following custom runtimes: - `c++` on `provided.al2023` - `dotnet7 aot` on `provided.al2` - `dotnet8 aot` on `provided.al2` -- `dotnet8 aot` on `provided.al2023` +- `dotnet9 aot` on `provided.al2023` - `quarkus native` on `provided.al2` - `graalvm java17` on `provided.al2` - `graalvm java21` on `provided.al2023` diff --git a/lambda-perf.sln b/lambda-perf.sln new file mode 100644 index 0000000000..0860e7c323 --- /dev/null +++ b/lambda-perf.sln @@ -0,0 +1,76 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.002.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "s3-uploader", "s3-uploader", "{18357C01-0D25-49F2-B6DD-41DA8FF40621}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runtimes", "runtimes", "{E612EB47-6668-45DD-A03A-28F104F12D79}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet9_aot_on_provided_al2023", "dotnet9_aot_on_provided_al2023", "{61883839-90C0-4C56-B373-74FA0C85FD55}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LambdaPerf", "s3-uploader\runtimes\dotnet9_aot_on_provided_al2023\src\LambdaPerf.csproj", "{9CDE3ECA-658A-4EC3-B9FA-F0FAECE87C9E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet8_aot_on_provided_al2", "dotnet8_aot_on_provided_al2", "{C811F54A-F43A-4C32-A207-73149D7F2DA2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LambdaPerf", "s3-uploader\runtimes\dotnet8_aot_on_provided_al2\src\LambdaPerf.csproj", "{1BACC1CC-F6E1-452B-941D-78867F914E9E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet7_aot_on_provided_al2", "dotnet7_aot_on_provided_al2", "{F629F65C-F1F7-41C1-8914-70941D274BC8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LambdaPerf", "s3-uploader\runtimes\dotnet7_aot_on_provided_al2\src\LambdaPerf.csproj", "{E513DCCB-DF10-4368-8F72-87D596DD0BFD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet6", "dotnet6", "{70E0BC2A-0B35-44AB-BD7F-8C9B834B795C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LambdaPerf", "s3-uploader\runtimes\dotnet6\src\LambdaPerf.csproj", "{4AC18533-86E4-446D-84B1-3D0BD9638FB6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet8", "dotnet8", "{D336D051-CF89-49CE-94DB-2C618608316C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LambdaPerf", "s3-uploader\runtimes\dotnet8\src\LambdaPerf.csproj", "{03E0A033-A499-491A-9AC3-94FD5F5FEF7F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9CDE3ECA-658A-4EC3-B9FA-F0FAECE87C9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9CDE3ECA-658A-4EC3-B9FA-F0FAECE87C9E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9CDE3ECA-658A-4EC3-B9FA-F0FAECE87C9E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9CDE3ECA-658A-4EC3-B9FA-F0FAECE87C9E}.Release|Any CPU.Build.0 = Release|Any CPU + {1BACC1CC-F6E1-452B-941D-78867F914E9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1BACC1CC-F6E1-452B-941D-78867F914E9E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1BACC1CC-F6E1-452B-941D-78867F914E9E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1BACC1CC-F6E1-452B-941D-78867F914E9E}.Release|Any CPU.Build.0 = Release|Any CPU + {E513DCCB-DF10-4368-8F72-87D596DD0BFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E513DCCB-DF10-4368-8F72-87D596DD0BFD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E513DCCB-DF10-4368-8F72-87D596DD0BFD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E513DCCB-DF10-4368-8F72-87D596DD0BFD}.Release|Any CPU.Build.0 = Release|Any CPU + {4AC18533-86E4-446D-84B1-3D0BD9638FB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4AC18533-86E4-446D-84B1-3D0BD9638FB6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4AC18533-86E4-446D-84B1-3D0BD9638FB6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4AC18533-86E4-446D-84B1-3D0BD9638FB6}.Release|Any CPU.Build.0 = Release|Any CPU + {03E0A033-A499-491A-9AC3-94FD5F5FEF7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03E0A033-A499-491A-9AC3-94FD5F5FEF7F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03E0A033-A499-491A-9AC3-94FD5F5FEF7F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {03E0A033-A499-491A-9AC3-94FD5F5FEF7F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {E612EB47-6668-45DD-A03A-28F104F12D79} = {18357C01-0D25-49F2-B6DD-41DA8FF40621} + {61883839-90C0-4C56-B373-74FA0C85FD55} = {E612EB47-6668-45DD-A03A-28F104F12D79} + {9CDE3ECA-658A-4EC3-B9FA-F0FAECE87C9E} = {61883839-90C0-4C56-B373-74FA0C85FD55} + {C811F54A-F43A-4C32-A207-73149D7F2DA2} = {E612EB47-6668-45DD-A03A-28F104F12D79} + {1BACC1CC-F6E1-452B-941D-78867F914E9E} = {C811F54A-F43A-4C32-A207-73149D7F2DA2} + {F629F65C-F1F7-41C1-8914-70941D274BC8} = {E612EB47-6668-45DD-A03A-28F104F12D79} + {E513DCCB-DF10-4368-8F72-87D596DD0BFD} = {F629F65C-F1F7-41C1-8914-70941D274BC8} + {70E0BC2A-0B35-44AB-BD7F-8C9B834B795C} = {E612EB47-6668-45DD-A03A-28F104F12D79} + {4AC18533-86E4-446D-84B1-3D0BD9638FB6} = {70E0BC2A-0B35-44AB-BD7F-8C9B834B795C} + {D336D051-CF89-49CE-94DB-2C618608316C} = {E612EB47-6668-45DD-A03A-28F104F12D79} + {03E0A033-A499-491A-9AC3-94FD5F5FEF7F} = {D336D051-CF89-49CE-94DB-2C618608316C} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {52F0ED17-ABE4-409A-AFD8-96874FD93DC7} + EndGlobalSection +EndGlobal diff --git a/manifest.json b/manifest.json index 77d40a2a1f..69ed50e16e 100644 --- a/manifest.json +++ b/manifest.json @@ -132,10 +132,10 @@ } }, { - "displayName": "dotnet8 aot (prov.al2023)", + "displayName": "dotnet9 aot (prov.al2023)", "runtime": "provided.al2023", "handler": "bootstrap", - "path": "dotnet8_aot_on_provided_al2023", + "path": "dotnet9_aot_on_provided_al2023", "architectures": ["x86_64", "arm64"], "image": { "baseImage": "public.ecr.aws/lambda/provided:al2023" diff --git a/s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/Dockerfile b/s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/Dockerfile similarity index 100% rename from s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/Dockerfile rename to s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/Dockerfile diff --git a/s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/build.sh b/s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/build.sh similarity index 80% rename from s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/build.sh rename to s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/build.sh index 3b4cc7b185..5be8541d7c 100755 --- a/s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/build.sh +++ b/s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/build.sh @@ -15,6 +15,6 @@ fi rm ${DIR_NAME}/code_${2}.zip 2> /dev/null -docker build --platform ${PLATFORM} ${DIR_NAME} --build-arg ARCH=${ARCH} --build-arg IMAGE_TAG=${IMAGE_TAG} -t maxday/dotnet8_on_provided_al2023_${2} -dockerId=$(docker create maxday/dotnet8_on_provided_al2023_${2}) +docker build --platform ${PLATFORM} ${DIR_NAME} --build-arg ARCH=${ARCH} --build-arg IMAGE_TAG=${IMAGE_TAG} -t maxday/dotnet9_on_provided_al2023_${2} +dockerId=$(docker create maxday/dotnet9_on_provided_al2023_${2}) docker cp $dockerId:/code.zip ${DIR_NAME}/code_${2}.zip diff --git a/s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/src/Function.cs b/s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/src/Function.cs similarity index 100% rename from s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/src/Function.cs rename to s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/src/Function.cs diff --git a/s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/src/LambdaPerf.csproj b/s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/src/LambdaPerf.csproj similarity index 84% rename from s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/src/LambdaPerf.csproj rename to s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/src/LambdaPerf.csproj index e8e7619934..b8b0efa4c6 100644 --- a/s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/src/LambdaPerf.csproj +++ b/s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/src/LambdaPerf.csproj @@ -4,7 +4,7 @@ Lambda Exe bootstrap - net8.0 + net9.0 enable enable true @@ -17,8 +17,8 @@ - - + + diff --git a/s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/src/aws-lambda-tools-defaults.json b/s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/src/aws-lambda-tools-defaults.json similarity index 89% rename from s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/src/aws-lambda-tools-defaults.json rename to s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/src/aws-lambda-tools-defaults.json index 1d9ab04e10..715c63a28a 100644 --- a/s3-uploader/runtimes/dotnet8_aot_on_provided_al2023/src/aws-lambda-tools-defaults.json +++ b/s3-uploader/runtimes/dotnet9_aot_on_provided_al2023/src/aws-lambda-tools-defaults.json @@ -1,7 +1,7 @@ { "configuration": "Release", "environment-variables" : "SSL_CERT_FILE=/tmp/noop", - "framework": "net8.0", + "framework": "net9.0", "function-runtime": "provided.al2023", "function-memory-size": 256, "function-timeout": 30, From 53236ec7798eb746e21b50e95134c41d0b89fc48 Mon Sep 17 00:00:00 2001 From: Stuart Lang Date: Mon, 18 Nov 2024 13:34:45 +0000 Subject: [PATCH 2/2] Remove vscode generated sln --- lambda-perf.sln | 76 ------------------------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 lambda-perf.sln diff --git a/lambda-perf.sln b/lambda-perf.sln deleted file mode 100644 index 0860e7c323..0000000000 --- a/lambda-perf.sln +++ /dev/null @@ -1,76 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.5.002.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "s3-uploader", "s3-uploader", "{18357C01-0D25-49F2-B6DD-41DA8FF40621}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runtimes", "runtimes", "{E612EB47-6668-45DD-A03A-28F104F12D79}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet9_aot_on_provided_al2023", "dotnet9_aot_on_provided_al2023", "{61883839-90C0-4C56-B373-74FA0C85FD55}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LambdaPerf", "s3-uploader\runtimes\dotnet9_aot_on_provided_al2023\src\LambdaPerf.csproj", "{9CDE3ECA-658A-4EC3-B9FA-F0FAECE87C9E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet8_aot_on_provided_al2", "dotnet8_aot_on_provided_al2", "{C811F54A-F43A-4C32-A207-73149D7F2DA2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LambdaPerf", "s3-uploader\runtimes\dotnet8_aot_on_provided_al2\src\LambdaPerf.csproj", "{1BACC1CC-F6E1-452B-941D-78867F914E9E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet7_aot_on_provided_al2", "dotnet7_aot_on_provided_al2", "{F629F65C-F1F7-41C1-8914-70941D274BC8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LambdaPerf", "s3-uploader\runtimes\dotnet7_aot_on_provided_al2\src\LambdaPerf.csproj", "{E513DCCB-DF10-4368-8F72-87D596DD0BFD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet6", "dotnet6", "{70E0BC2A-0B35-44AB-BD7F-8C9B834B795C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LambdaPerf", "s3-uploader\runtimes\dotnet6\src\LambdaPerf.csproj", "{4AC18533-86E4-446D-84B1-3D0BD9638FB6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet8", "dotnet8", "{D336D051-CF89-49CE-94DB-2C618608316C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LambdaPerf", "s3-uploader\runtimes\dotnet8\src\LambdaPerf.csproj", "{03E0A033-A499-491A-9AC3-94FD5F5FEF7F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9CDE3ECA-658A-4EC3-B9FA-F0FAECE87C9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9CDE3ECA-658A-4EC3-B9FA-F0FAECE87C9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9CDE3ECA-658A-4EC3-B9FA-F0FAECE87C9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9CDE3ECA-658A-4EC3-B9FA-F0FAECE87C9E}.Release|Any CPU.Build.0 = Release|Any CPU - {1BACC1CC-F6E1-452B-941D-78867F914E9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BACC1CC-F6E1-452B-941D-78867F914E9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BACC1CC-F6E1-452B-941D-78867F914E9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BACC1CC-F6E1-452B-941D-78867F914E9E}.Release|Any CPU.Build.0 = Release|Any CPU - {E513DCCB-DF10-4368-8F72-87D596DD0BFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E513DCCB-DF10-4368-8F72-87D596DD0BFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E513DCCB-DF10-4368-8F72-87D596DD0BFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E513DCCB-DF10-4368-8F72-87D596DD0BFD}.Release|Any CPU.Build.0 = Release|Any CPU - {4AC18533-86E4-446D-84B1-3D0BD9638FB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AC18533-86E4-446D-84B1-3D0BD9638FB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AC18533-86E4-446D-84B1-3D0BD9638FB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AC18533-86E4-446D-84B1-3D0BD9638FB6}.Release|Any CPU.Build.0 = Release|Any CPU - {03E0A033-A499-491A-9AC3-94FD5F5FEF7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03E0A033-A499-491A-9AC3-94FD5F5FEF7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03E0A033-A499-491A-9AC3-94FD5F5FEF7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03E0A033-A499-491A-9AC3-94FD5F5FEF7F}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {E612EB47-6668-45DD-A03A-28F104F12D79} = {18357C01-0D25-49F2-B6DD-41DA8FF40621} - {61883839-90C0-4C56-B373-74FA0C85FD55} = {E612EB47-6668-45DD-A03A-28F104F12D79} - {9CDE3ECA-658A-4EC3-B9FA-F0FAECE87C9E} = {61883839-90C0-4C56-B373-74FA0C85FD55} - {C811F54A-F43A-4C32-A207-73149D7F2DA2} = {E612EB47-6668-45DD-A03A-28F104F12D79} - {1BACC1CC-F6E1-452B-941D-78867F914E9E} = {C811F54A-F43A-4C32-A207-73149D7F2DA2} - {F629F65C-F1F7-41C1-8914-70941D274BC8} = {E612EB47-6668-45DD-A03A-28F104F12D79} - {E513DCCB-DF10-4368-8F72-87D596DD0BFD} = {F629F65C-F1F7-41C1-8914-70941D274BC8} - {70E0BC2A-0B35-44AB-BD7F-8C9B834B795C} = {E612EB47-6668-45DD-A03A-28F104F12D79} - {4AC18533-86E4-446D-84B1-3D0BD9638FB6} = {70E0BC2A-0B35-44AB-BD7F-8C9B834B795C} - {D336D051-CF89-49CE-94DB-2C618608316C} = {E612EB47-6668-45DD-A03A-28F104F12D79} - {03E0A033-A499-491A-9AC3-94FD5F5FEF7F} = {D336D051-CF89-49CE-94DB-2C618608316C} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {52F0ED17-ABE4-409A-AFD8-96874FD93DC7} - EndGlobalSection -EndGlobal