diff --git a/Tools/LambdaTestTool/README.md b/Tools/LambdaTestTool/README.md index 5e9003430..107e4f0a7 100644 --- a/Tools/LambdaTestTool/README.md +++ b/Tools/LambdaTestTool/README.md @@ -35,6 +35,7 @@ that the Lambda function will be run in. Below is the list of published versions | .NET 5.0 (Deprecated) | Amazon.Lambda.TestTool-5.0 | dotnet-lambda-test-tool-5.0.exe | | .NET 6.0 | Amazon.Lambda.TestTool-6.0 | dotnet-lambda-test-tool-6.0.exe | | .NET 7.0 | Amazon.Lambda.TestTool-7.0 | dotnet-lambda-test-tool-7.0.exe | +| .NET 8.0 | Amazon.Lambda.TestTool-8.0 | dotnet-lambda-test-tool-8.0.exe | ## AWS Credentials diff --git a/Tools/LambdaTestTool/aws-lambda-test-tool-netcore.sln b/Tools/LambdaTestTool/aws-lambda-test-tool-netcore.sln index 024055f54..dddbfa627 100644 --- a/Tools/LambdaTestTool/aws-lambda-test-tool-netcore.sln +++ b/Tools/LambdaTestTool/aws-lambda-test-tool-netcore.sln @@ -13,38 +13,30 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{28C935E3 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LambdaFunctions", "LambdaFunctions", "{BFD718DB-4526-4BED-B2B0-BB446EDFFEA1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore31", "netcore31", "{0B078893-2F43-4C0C-88FE-98D0839ED7A9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionSignatureExamples", "tests\LambdaFunctions\netcore31\FunctionSignatureExamples\FunctionSignatureExamples.csproj", "{5C2B567E-39D7-4D4F-AED0-2873B00CE4B0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "S3EventFunction", "tests\LambdaFunctions\netcore31\S3EventFunction\S3EventFunction.csproj", "{8E74AC82-AAF4-422B-8460-37D9499A8BF8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerlessFunctionTemplateYamlExample", "tests\LambdaFunctions\netcore31\ServerlessFunctionTemplateYamlExample\ServerlessFunctionTemplateYamlExample.csproj", "{C4D6ECCD-0E7B-42A9-BAA1-2CBB4E135EC5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerlessTemplateExample", "tests\LambdaFunctions\netcore31\ServerlessTemplateExample\ServerlessTemplateExample.csproj", "{C05364CB-CB13-4048-90E5-48368C6F7C9A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8B0304AF-C6CF-4B62-B1B3-3F7C045B1BC4}" + ProjectSection(SolutionItems) = preProject + README.md = README.md + EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerlessTemplateYamlExample", "tests\LambdaFunctions\netcore31\ServerlessTemplateYamlExample\ServerlessTemplateYamlExample.csproj", "{6F4F4BD1-2CCD-4FAB-BCCD-84AE111CDA8B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Amazon.Lambda.TestTool.BlazorTester.Tests", "tests\Amazon.Lambda.TestTool.BlazorTester.Tests\Amazon.Lambda.TestTool.BlazorTester.Tests.csproj", "{0CA7DDC6-A1C5-467C-9CBF-8B4290D56D4A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToUpperFunc", "tests\LambdaFunctions\netcore31\ToUpperFunc\ToUpperFunc.csproj", "{68AEBAAF-0228-4B03-8ED1-0BB94333A304}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Amazon.Lambda.TestTool.Tests", "tests\Amazon.Lambda.TestTool.Tests\Amazon.Lambda.TestTool.Tests.csproj", "{60B1B64E-496C-4589-9208-1448B9784051}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Amazon.Lambda.TestTool.Tests.Shared", "tests\Amazon.Lambda.TestTool.Tests.Shared\Amazon.Lambda.TestTool.Tests.Shared.shproj", "{70AFF681-844A-428C-ABA2-7053E61D39C8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGeneratorExample", "tests\LambdaFunctions\SourceGeneratorExample\SourceGeneratorExample.csproj", "{968654FE-84EE-4EA3-B047-4B70D502511B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Amazon.Lambda.TestTool.Tests.NETCore31", "tests\Amazon.Lambda.TestTool.Tests.NETCore31\Amazon.Lambda.TestTool.Tests.NETCore31.csproj", "{E57ABB02-E8FC-4011-95D3-E9CB9412EDCB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreAPIExample", "tests\LambdaFunctions\AspNetCoreAPIExample\AspNetCoreAPIExample.csproj", "{EC2F36EE-9857-4009-AB4D-1CFB079F21F9}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8B0304AF-C6CF-4B62-B1B3-3F7C045B1BC4}" - ProjectSection(SolutionItems) = preProject - README.md = README.md - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionSignatureExamples", "tests\LambdaFunctions\FunctionSignatureExamples\FunctionSignatureExamples.csproj", "{296E27C7-D725-4702-94DC-4A0249722585}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreAPIExample", "tests\LambdaFunctions\netcore31\AspNetCoreAPIExample\AspNetCoreAPIExample.csproj", "{5E1FF56C-9691-45B4-A961-24950A2C106C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "S3EventFunction", "tests\LambdaFunctions\S3EventFunction\S3EventFunction.csproj", "{40098664-743E-4461-941F-B8C44D445AFB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Amazon.Lambda.TestTool.BlazorTester.Tests", "tests\Amazon.Lambda.TestTool.BlazorTester.Tests\Amazon.Lambda.TestTool.BlazorTester.Tests.csproj", "{0CA7DDC6-A1C5-467C-9CBF-8B4290D56D4A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerlessFunctionTemplateYamlExample", "tests\LambdaFunctions\ServerlessFunctionTemplateYamlExample\ServerlessFunctionTemplateYamlExample.csproj", "{38405417-3704-4150-8526-B22D41AB2FB8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net6", "net6", "{F08BF489-BD05-4DC1-9772-AB5E137B87B8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerlessTemplateExample", "tests\LambdaFunctions\ServerlessTemplateExample\ServerlessTemplateExample.csproj", "{1055D389-9927-4EED-9876-4B497CB3B3C2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGeneratorExample", "tests\LambdaFunctions\net6\SourceGeneratorExample\SourceGeneratorExample.csproj", "{9F8D7697-46FC-45E4-B795-11CCDA2B68B3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerlessTemplateYamlExample", "tests\LambdaFunctions\ServerlessTemplateYamlExample\ServerlessTemplateYamlExample.csproj", "{13B8F61E-5E34-46CD-B76F-A92D9DCF6946}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.Lambda.TestTool.Tests.NET6", "tests\Amazon.Lambda.TestTool.Tests.NET6\Amazon.Lambda.TestTool.Tests.NET6.csproj", "{2C69BEB2-858E-43E3-9951-74E780FEB1BF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToUpperFunc", "tests\LambdaFunctions\ToUpperFunc\ToUpperFunc.csproj", "{7BBBAB9A-1630-4B15-AEB8-FA90BBDC165C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -60,50 +52,46 @@ Global {E615A185-BBB0-4A92-8C61-47F699FFDA7F}.Debug|Any CPU.Build.0 = Debug|Any CPU {E615A185-BBB0-4A92-8C61-47F699FFDA7F}.Release|Any CPU.ActiveCfg = Release|Any CPU {E615A185-BBB0-4A92-8C61-47F699FFDA7F}.Release|Any CPU.Build.0 = Release|Any CPU - {5C2B567E-39D7-4D4F-AED0-2873B00CE4B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C2B567E-39D7-4D4F-AED0-2873B00CE4B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C2B567E-39D7-4D4F-AED0-2873B00CE4B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C2B567E-39D7-4D4F-AED0-2873B00CE4B0}.Release|Any CPU.Build.0 = Release|Any CPU - {8E74AC82-AAF4-422B-8460-37D9499A8BF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E74AC82-AAF4-422B-8460-37D9499A8BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E74AC82-AAF4-422B-8460-37D9499A8BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E74AC82-AAF4-422B-8460-37D9499A8BF8}.Release|Any CPU.Build.0 = Release|Any CPU - {C4D6ECCD-0E7B-42A9-BAA1-2CBB4E135EC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4D6ECCD-0E7B-42A9-BAA1-2CBB4E135EC5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4D6ECCD-0E7B-42A9-BAA1-2CBB4E135EC5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4D6ECCD-0E7B-42A9-BAA1-2CBB4E135EC5}.Release|Any CPU.Build.0 = Release|Any CPU - {C05364CB-CB13-4048-90E5-48368C6F7C9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C05364CB-CB13-4048-90E5-48368C6F7C9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C05364CB-CB13-4048-90E5-48368C6F7C9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C05364CB-CB13-4048-90E5-48368C6F7C9A}.Release|Any CPU.Build.0 = Release|Any CPU - {6F4F4BD1-2CCD-4FAB-BCCD-84AE111CDA8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F4F4BD1-2CCD-4FAB-BCCD-84AE111CDA8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F4F4BD1-2CCD-4FAB-BCCD-84AE111CDA8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F4F4BD1-2CCD-4FAB-BCCD-84AE111CDA8B}.Release|Any CPU.Build.0 = Release|Any CPU - {68AEBAAF-0228-4B03-8ED1-0BB94333A304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68AEBAAF-0228-4B03-8ED1-0BB94333A304}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68AEBAAF-0228-4B03-8ED1-0BB94333A304}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68AEBAAF-0228-4B03-8ED1-0BB94333A304}.Release|Any CPU.Build.0 = Release|Any CPU - {E57ABB02-E8FC-4011-95D3-E9CB9412EDCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E57ABB02-E8FC-4011-95D3-E9CB9412EDCB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E57ABB02-E8FC-4011-95D3-E9CB9412EDCB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E57ABB02-E8FC-4011-95D3-E9CB9412EDCB}.Release|Any CPU.Build.0 = Release|Any CPU - {5E1FF56C-9691-45B4-A961-24950A2C106C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E1FF56C-9691-45B4-A961-24950A2C106C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E1FF56C-9691-45B4-A961-24950A2C106C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E1FF56C-9691-45B4-A961-24950A2C106C}.Release|Any CPU.Build.0 = Release|Any CPU {0CA7DDC6-A1C5-467C-9CBF-8B4290D56D4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0CA7DDC6-A1C5-467C-9CBF-8B4290D56D4A}.Debug|Any CPU.Build.0 = Debug|Any CPU {0CA7DDC6-A1C5-467C-9CBF-8B4290D56D4A}.Release|Any CPU.ActiveCfg = Release|Any CPU {0CA7DDC6-A1C5-467C-9CBF-8B4290D56D4A}.Release|Any CPU.Build.0 = Release|Any CPU - {9F8D7697-46FC-45E4-B795-11CCDA2B68B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F8D7697-46FC-45E4-B795-11CCDA2B68B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F8D7697-46FC-45E4-B795-11CCDA2B68B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F8D7697-46FC-45E4-B795-11CCDA2B68B3}.Release|Any CPU.Build.0 = Release|Any CPU - {2C69BEB2-858E-43E3-9951-74E780FEB1BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C69BEB2-858E-43E3-9951-74E780FEB1BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C69BEB2-858E-43E3-9951-74E780FEB1BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C69BEB2-858E-43E3-9951-74E780FEB1BF}.Release|Any CPU.Build.0 = Release|Any CPU + {60B1B64E-496C-4589-9208-1448B9784051}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {60B1B64E-496C-4589-9208-1448B9784051}.Debug|Any CPU.Build.0 = Debug|Any CPU + {60B1B64E-496C-4589-9208-1448B9784051}.Release|Any CPU.ActiveCfg = Release|Any CPU + {60B1B64E-496C-4589-9208-1448B9784051}.Release|Any CPU.Build.0 = Release|Any CPU + {968654FE-84EE-4EA3-B047-4B70D502511B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {968654FE-84EE-4EA3-B047-4B70D502511B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {968654FE-84EE-4EA3-B047-4B70D502511B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {968654FE-84EE-4EA3-B047-4B70D502511B}.Release|Any CPU.Build.0 = Release|Any CPU + {EC2F36EE-9857-4009-AB4D-1CFB079F21F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EC2F36EE-9857-4009-AB4D-1CFB079F21F9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EC2F36EE-9857-4009-AB4D-1CFB079F21F9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EC2F36EE-9857-4009-AB4D-1CFB079F21F9}.Release|Any CPU.Build.0 = Release|Any CPU + {296E27C7-D725-4702-94DC-4A0249722585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {296E27C7-D725-4702-94DC-4A0249722585}.Debug|Any CPU.Build.0 = Debug|Any CPU + {296E27C7-D725-4702-94DC-4A0249722585}.Release|Any CPU.ActiveCfg = Release|Any CPU + {296E27C7-D725-4702-94DC-4A0249722585}.Release|Any CPU.Build.0 = Release|Any CPU + {40098664-743E-4461-941F-B8C44D445AFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {40098664-743E-4461-941F-B8C44D445AFB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {40098664-743E-4461-941F-B8C44D445AFB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {40098664-743E-4461-941F-B8C44D445AFB}.Release|Any CPU.Build.0 = Release|Any CPU + {38405417-3704-4150-8526-B22D41AB2FB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {38405417-3704-4150-8526-B22D41AB2FB8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {38405417-3704-4150-8526-B22D41AB2FB8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {38405417-3704-4150-8526-B22D41AB2FB8}.Release|Any CPU.Build.0 = Release|Any CPU + {1055D389-9927-4EED-9876-4B497CB3B3C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1055D389-9927-4EED-9876-4B497CB3B3C2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1055D389-9927-4EED-9876-4B497CB3B3C2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1055D389-9927-4EED-9876-4B497CB3B3C2}.Release|Any CPU.Build.0 = Release|Any CPU + {13B8F61E-5E34-46CD-B76F-A92D9DCF6946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {13B8F61E-5E34-46CD-B76F-A92D9DCF6946}.Debug|Any CPU.Build.0 = Debug|Any CPU + {13B8F61E-5E34-46CD-B76F-A92D9DCF6946}.Release|Any CPU.ActiveCfg = Release|Any CPU + {13B8F61E-5E34-46CD-B76F-A92D9DCF6946}.Release|Any CPU.Build.0 = Release|Any CPU + {7BBBAB9A-1630-4B15-AEB8-FA90BBDC165C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7BBBAB9A-1630-4B15-AEB8-FA90BBDC165C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7BBBAB9A-1630-4B15-AEB8-FA90BBDC165C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7BBBAB9A-1630-4B15-AEB8-FA90BBDC165C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -112,26 +100,18 @@ Global {F24CC22C-C409-4FBB-A065-9359A98E4856} = {14B7DE35-92C2-421C-9445-61777B1A0128} {E615A185-BBB0-4A92-8C61-47F699FFDA7F} = {14B7DE35-92C2-421C-9445-61777B1A0128} {BFD718DB-4526-4BED-B2B0-BB446EDFFEA1} = {28C935E3-4FB4-4B09-A9DB-26A1EB04CDE0} - {0B078893-2F43-4C0C-88FE-98D0839ED7A9} = {BFD718DB-4526-4BED-B2B0-BB446EDFFEA1} - {5C2B567E-39D7-4D4F-AED0-2873B00CE4B0} = {0B078893-2F43-4C0C-88FE-98D0839ED7A9} - {8E74AC82-AAF4-422B-8460-37D9499A8BF8} = {0B078893-2F43-4C0C-88FE-98D0839ED7A9} - {C4D6ECCD-0E7B-42A9-BAA1-2CBB4E135EC5} = {0B078893-2F43-4C0C-88FE-98D0839ED7A9} - {C05364CB-CB13-4048-90E5-48368C6F7C9A} = {0B078893-2F43-4C0C-88FE-98D0839ED7A9} - {6F4F4BD1-2CCD-4FAB-BCCD-84AE111CDA8B} = {0B078893-2F43-4C0C-88FE-98D0839ED7A9} - {68AEBAAF-0228-4B03-8ED1-0BB94333A304} = {0B078893-2F43-4C0C-88FE-98D0839ED7A9} - {70AFF681-844A-428C-ABA2-7053E61D39C8} = {28C935E3-4FB4-4B09-A9DB-26A1EB04CDE0} - {E57ABB02-E8FC-4011-95D3-E9CB9412EDCB} = {28C935E3-4FB4-4B09-A9DB-26A1EB04CDE0} - {5E1FF56C-9691-45B4-A961-24950A2C106C} = {0B078893-2F43-4C0C-88FE-98D0839ED7A9} {0CA7DDC6-A1C5-467C-9CBF-8B4290D56D4A} = {28C935E3-4FB4-4B09-A9DB-26A1EB04CDE0} - {F08BF489-BD05-4DC1-9772-AB5E137B87B8} = {BFD718DB-4526-4BED-B2B0-BB446EDFFEA1} - {9F8D7697-46FC-45E4-B795-11CCDA2B68B3} = {F08BF489-BD05-4DC1-9772-AB5E137B87B8} - {2C69BEB2-858E-43E3-9951-74E780FEB1BF} = {28C935E3-4FB4-4B09-A9DB-26A1EB04CDE0} + {60B1B64E-496C-4589-9208-1448B9784051} = {28C935E3-4FB4-4B09-A9DB-26A1EB04CDE0} + {968654FE-84EE-4EA3-B047-4B70D502511B} = {BFD718DB-4526-4BED-B2B0-BB446EDFFEA1} + {EC2F36EE-9857-4009-AB4D-1CFB079F21F9} = {BFD718DB-4526-4BED-B2B0-BB446EDFFEA1} + {296E27C7-D725-4702-94DC-4A0249722585} = {BFD718DB-4526-4BED-B2B0-BB446EDFFEA1} + {40098664-743E-4461-941F-B8C44D445AFB} = {BFD718DB-4526-4BED-B2B0-BB446EDFFEA1} + {38405417-3704-4150-8526-B22D41AB2FB8} = {BFD718DB-4526-4BED-B2B0-BB446EDFFEA1} + {1055D389-9927-4EED-9876-4B497CB3B3C2} = {BFD718DB-4526-4BED-B2B0-BB446EDFFEA1} + {13B8F61E-5E34-46CD-B76F-A92D9DCF6946} = {BFD718DB-4526-4BED-B2B0-BB446EDFFEA1} + {7BBBAB9A-1630-4B15-AEB8-FA90BBDC165C} = {BFD718DB-4526-4BED-B2B0-BB446EDFFEA1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E6C77567-6F16-4EE3-8743-ADE6B68434FD} EndGlobalSection - GlobalSection(SharedMSBuildProjectFiles) = preSolution - tests\Amazon.Lambda.TestTool.Tests.Shared\Amazon.Lambda.TestTool.Tests.Shared.projitems*{70aff681-844a-428c-aba2-7053e61d39c8}*SharedItemsImports = 13 - tests\Amazon.Lambda.TestTool.Tests.Shared\Amazon.Lambda.TestTool.Tests.Shared.projitems*{e57abb02-e8fc-4011-95d3-e9cb9412edcb}*SharedItemsImports = 5 - EndGlobalSection EndGlobal diff --git a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester.csproj b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester.csproj index 58113ca38..bc4f0044d 100644 --- a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester.csproj +++ b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester.csproj @@ -6,23 +6,14 @@ Exe A tool to help debug and test your .NET Core AWS Lambda functions locally. Latest - 0.14.1 + 0.15.0 AWS .NET Lambda Test Tool Apache 2 AWS;Amazon;Lambda 1701;1702;1591;1587;3021;NU5100;CS1591 true - netcoreapp3.1;net5.0;net6.0;net7.0 + net6.0;net7.0;net8.0 - - - - - - - - - @@ -30,9 +21,13 @@ - + - + + + + + diff --git a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester31-pack.csproj b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester31-pack.csproj deleted file mode 100644 index 9f6414c5c..000000000 --- a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester31-pack.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - Exe - A tool to help debug and test your .NET Core 3.1 AWS Lambda functions locally. - 0.14.1 - AWS .NET Lambda Test Tool - Apache 2 - AWS;Amazon;Lambda - netcoreapp3.1 - dotnet-lambda-test-tool-3.1 - true - true - Amazon.Lambda.TestTool-3.1 - Amazon.Lambda.TestTool.BlazorTester - Amazon.Lambda.TestTool.BlazorTester - true - false - - - - - - - - - - - - - diff --git a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester60-pack.csproj b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester60-pack.csproj index d54bc4a99..fcc7b173e 100644 --- a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester60-pack.csproj +++ b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester60-pack.csproj @@ -5,7 +5,7 @@ Exe A tool to help debug and test your .NET 6.0 AWS Lambda functions locally. - 0.14.1 + 0.15.0 AWS .NET Lambda Test Tool Apache 2 AWS;Amazon;Lambda diff --git a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester70-pack.csproj b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester70-pack.csproj index 688a7bf9c..b8f3a3e76 100644 --- a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester70-pack.csproj +++ b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester70-pack.csproj @@ -5,7 +5,7 @@ Exe A tool to help debug and test your .NET 7.0 AWS Lambda functions locally. - 0.14.1 + 0.15.0 AWS .NET Lambda Test Tool Apache 2 AWS;Amazon;Lambda diff --git a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester50-pack.csproj b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester80-pack.csproj similarity index 75% rename from Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester50-pack.csproj rename to Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester80-pack.csproj index 4b6a9d288..7bc4b940f 100644 --- a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester50-pack.csproj +++ b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester80-pack.csproj @@ -4,25 +4,25 @@ Exe - A tool to help debug and test your .NET 5.0 AWS Lambda functions locally. - 0.14.1 + A tool to help debug and test your .NET 8.0 AWS Lambda functions locally. + 0.15.0 AWS .NET Lambda Test Tool Apache 2 AWS;Amazon;Lambda - net5.0 - dotnet-lambda-test-tool-5.0 + net8.0 + dotnet-lambda-test-tool-8.0 true true - Amazon.Lambda.TestTool-5.0 + Amazon.Lambda.TestTool-8.0 Amazon.Lambda.TestTool.BlazorTester - Amazon.Lambda.TestTool.BlazorTester - true + Amazon.Lambda.TestTool.BlazorTester + true false - + diff --git a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Constants.cs b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Constants.cs index bcf6d6a5d..4c716d0e2 100644 --- a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Constants.cs +++ b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Constants.cs @@ -5,14 +5,12 @@ public class Constants public const int DEFAULT_PORT = 5050; public const string DEFAULT_HOST = "localhost"; -#if NETCOREAPP3_1 - public const string PRODUCT_NAME = "AWS .NET Core 3.1 Mock Lambda Test Tool"; -#elif NET5_0 - public const string PRODUCT_NAME = "AWS .NET Core 5.0 Mock Lambda Test Tool"; -#elif NET6_0 - public const string PRODUCT_NAME = "AWS .NET Core 6.0 Mock Lambda Test Tool"; +#if NET6_0 + public const string PRODUCT_NAME = "AWS .NET 6.0 Mock Lambda Test Tool"; #elif NET7_0 - public const string PRODUCT_NAME = "AWS .NET Core 7.0 Mock Lambda Test Tool"; + public const string PRODUCT_NAME = "AWS .NET 7.0 Mock Lambda Test Tool"; +#elif NET8_0 + public const string PRODUCT_NAME = "AWS .NET 8.0 Mock Lambda Test Tool"; #else Update for new target framework!!! #endif diff --git a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Pages/Documentation.razor b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Pages/Documentation.razor index 599ee5eb6..e033f00b9 100644 --- a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Pages/Documentation.razor +++ b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Pages/Documentation.razor @@ -84,8 +84,8 @@ JSON Lambda event document as the POST request's body.

-> dotnet lambda-test-tool-3.1 --help
-AWS .NET Core 3.1 Mock Lambda Test Tool (0.10.0)
+> dotnet lambda-test-tool-6.0 --help
+AWS .NET Core 6.0 Mock Lambda Test Tool (@Amazon.Lambda.TestTool.Utils.DetermineToolVersion())
 
 The .NET Lambda Test Tool can be launched in 2 modes. The default mode is to launch a web interface to select the Lambda code
 to execute with in the Lambda test tool. The second mode skips using the web interface and the Lambda code is identified
@@ -144,8 +144,8 @@ These options are valid in the no web interface mode.
     "Mock Lambda Test Tool": {
       "commandName": "Executable",
       "commandLineArgs": "--no-ui --payload payload.json",
-      "workingDirectory": ".\\bin\\$(Configuration)\\netcoreapp3.1",
-      "executablePath": "C:\\Users\\%USERNAME%\\.dotnet\\tools\\dotnet-lambda-test-tool-3.1.exe"
+      "workingDirectory": ".\\bin\\$(Configuration)\\net6.0",
+      "executablePath": "C:\\Users\\%USERNAME%\\.dotnet\\tools\\dotnet-lambda-test-tool-6.0.exe"
     }
   }
 }
diff --git a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Startup.cs b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Startup.cs
index e8815e74c..ac73ed7f5 100644
--- a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Startup.cs
+++ b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Startup.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -84,14 +85,30 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddBlazoredModal();
 
+#if NET8_0_OR_GREATER
+            // Starting with .NET 8 how the IFileProvider is configured for Blazor
+            // to serve the Blazor embedded content was changed. The previous version
+            // of using the PostConfigure no longer works because the "o.FileProvider" is null.
+            // Using this IPostConfigureOptions service approach does not
+            // work in .NET versions before .NET 8.
+            // For further context checkout this GitHub issue.
+            // https://github.com/dotnet/aspnetcore/issues/51794
+            services.AddTransient, ConfigureStaticFilesOptions>();
+#else
             services.AddOptions()
                 .PostConfigure(o =>
                 {
                     var fileProvider = new ManifestEmbeddedFileProvider(typeof(Startup).Assembly, "wwwroot");
 
+                    var f1 = fileProvider.GetFileInfo("_framework/blazor.server.js");
+
                     // Make sure we don't remove the existing file providers (blazor needs this)
-                    o.FileProvider = new CompositeFileProvider(o.FileProvider, fileProvider);
+                    o.FileProvider = new CompositeFileProvider(fileProvider);
+
+                    var f = o.FileProvider.GetFileInfo("_framework/blazor.server.js");
+                    Console.WriteLine(f.Name);
                 });
+#endif
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -114,5 +131,31 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 endpoints.MapFallbackToPage("/_Host");
             });
         }
+
+#if NET8_0_OR_GREATER
+        internal class ConfigureStaticFilesOptions : IPostConfigureOptions
+        {
+            public ConfigureStaticFilesOptions(IWebHostEnvironment environment)
+            {
+                Environment = environment;
+            }
+
+            public IWebHostEnvironment Environment { get; }
+
+            public void PostConfigure(string name, StaticFileOptions options)
+            {
+                name = name ?? throw new ArgumentNullException(nameof(name));
+                options = options ?? throw new ArgumentNullException(nameof(options));
+
+                if (name != Options.DefaultName)
+                {
+                    return;
+                }
+
+                var fileProvider = new ManifestEmbeddedFileProvider(typeof(Startup).Assembly, "wwwroot");
+                Environment.WebRootFileProvider = fileProvider;
+            }
+        }
+#endif
     }
 }
diff --git a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
index ee5b0b1fa..4aed79475 100644
--- a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
+++ b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
@@ -3,7 +3,7 @@
   
   
   
-    netcoreapp3.1;net5.0;net6.0;net7.0
+    net6.0;net7.0;net8.0
     Common code for the AWS .NET Core Lambda Mock Test Tool.
     1701;1702;1591;1587;3021;NU5100;CS1591
   
@@ -19,25 +19,18 @@
     
   
 
-  
-    
-  
-  
-  
-    netcoreapp3.1
-  
-  
-  
-    net5.0
-      
 	
   
     net6.0
     	
+  
+  
+    net7.0
+   
 
-    
-	    
-    
+  
+    net8.0
+     
 
 	
 		
@@ -46,6 +39,10 @@
 	
 		
 	
+	
+	
+		
+		
 
 	
     
diff --git a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/TestToolStartup.cs b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/TestToolStartup.cs
index 4b748fe5a..b130addb9 100644
--- a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/TestToolStartup.cs
+++ b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/TestToolStartup.cs
@@ -54,28 +54,16 @@ public static void Startup(string productName, Action
 
                 var lambdaAssemblyDirectory = commandOptions.Path ?? Directory.GetCurrentDirectory();
 
-#if NETCOREAPP3_1
-                var targetFramework = "netcoreapp3.1";
-#elif NET5_0
-                var targetFramework = "net5.0";
-#elif NET6_0
+#if NET6_0
                 var targetFramework = "net6.0";
 #elif NET7_0
                 var targetFramework = "net7.0";
+#elif NET8_0
+                var targetFramework = "net8.0";
 #endif
 
-                // Check to see if running in debug mode from this project's directory which means the test tool is being debugged.
-                // To make debugging easier pick one of the test Lambda projects.
-                if (lambdaAssemblyDirectory.EndsWith("Amazon.Lambda.TestTool.WebTester21"))
-                {
-                    lambdaAssemblyDirectory = Path.Combine(lambdaAssemblyDirectory, $"../../tests/LambdaFunctions/netcore21/S3EventFunction/bin/Debug/{targetFramework}");
-                }
-                else if (lambdaAssemblyDirectory.EndsWith("Amazon.Lambda.TestTool.WebTester31"))
-                {
-                    lambdaAssemblyDirectory = Path.Combine(lambdaAssemblyDirectory, $"../../tests/LambdaFunctions/netcore31/S3EventFunction/bin/Debug/{targetFramework}");
-                }
                 // If running in the project directory select the build directory so the deps.json file can be found.
-                else if (Utils.IsProjectDirectory(lambdaAssemblyDirectory))
+                if (Utils.IsProjectDirectory(lambdaAssemblyDirectory))
                 {
                     lambdaAssemblyDirectory = Path.Combine(lambdaAssemblyDirectory, $"bin/Debug/{targetFramework}");
                 }
diff --git a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/Utils.cs b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/Utils.cs
index ebc5528b8..41756ae38 100644
--- a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/Utils.cs
+++ b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/Utils.cs
@@ -32,7 +32,15 @@ public static string DetermineToolVersion()
                 // ignored
             }
 
-            return attribute?.InformationalVersion;
+            var version = attribute?.InformationalVersion;
+
+            // Check to see if the version has a git commit id suffix and if so remove it.
+            if (version == null && version.IndexOf('+') != -1)
+            {
+                version = version.Substring(0, version.IndexOf('+'));
+            }
+
+            return version;
         }
 
         /// 
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.BlazorTester.Tests/Amazon.Lambda.TestTool.BlazorTester.Tests.csproj b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.BlazorTester.Tests/Amazon.Lambda.TestTool.BlazorTester.Tests.csproj
index babfcd5ed..6bbb530ad 100644
--- a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.BlazorTester.Tests/Amazon.Lambda.TestTool.BlazorTester.Tests.csproj
+++ b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.BlazorTester.Tests/Amazon.Lambda.TestTool.BlazorTester.Tests.csproj
@@ -1,7 +1,7 @@
 
 
   
-    net6.0
+    net6.0;net8.0
     false
   
 
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NETCore31/Amazon.Lambda.TestTool.Tests.NETCore31.csproj b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NETCore31/Amazon.Lambda.TestTool.Tests.NETCore31.csproj
index 7317c37d1..e9e860ac9 100644
--- a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NETCore31/Amazon.Lambda.TestTool.Tests.NETCore31.csproj
+++ b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NETCore31/Amazon.Lambda.TestTool.Tests.NETCore31.csproj
@@ -24,11 +24,6 @@
   
   
     
-    
-    
-    
-    
-    
   
   
   
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/Amazon.Lambda.TestTool.Tests.NET6.csproj b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/Amazon.Lambda.TestTool.Tests.csproj
similarity index 53%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/Amazon.Lambda.TestTool.Tests.NET6.csproj
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/Amazon.Lambda.TestTool.Tests.csproj
index d8521f1db..d2974115a 100644
--- a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/Amazon.Lambda.TestTool.Tests.NET6.csproj
+++ b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/Amazon.Lambda.TestTool.Tests.csproj
@@ -1,10 +1,8 @@
 
 
   
-    net6.0
+    net6.0;net8.0
     enable
-    enable
-
     false
   
 
@@ -23,7 +21,14 @@
 
   
     
-    
+    
+    
+    
+    
+    
+    
+    
+    
   
 
   
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/AwsServiceTests.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/AwsServiceTests.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/AwsServiceTests.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/AwsServiceTests.cs
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/CommandLineParserTests.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/CommandLineParserTests.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/CommandLineParserTests.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/CommandLineParserTests.cs
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/ConsoleCaptureTests.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/ConsoleCaptureTests.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/ConsoleCaptureTests.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/ConsoleCaptureTests.cs
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/DefaultsFileParseTests.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/DefaultsFileParseTests.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/DefaultsFileParseTests.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/DefaultsFileParseTests.cs
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/DlqMonitorTests.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/DlqMonitorTests.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/DlqMonitorTests.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/DlqMonitorTests.cs
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/InvokeFunctionTests.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/InvokeFunctionTests.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/InvokeFunctionTests.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/InvokeFunctionTests.cs
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/LambdaAssemblyPathTests.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/LambdaAssemblyPathTests.cs
similarity index 93%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/LambdaAssemblyPathTests.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/LambdaAssemblyPathTests.cs
index e47c4dcf4..f50067427 100644
--- a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/LambdaAssemblyPathTests.cs
+++ b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/LambdaAssemblyPathTests.cs
@@ -1,4 +1,4 @@
-namespace Amazon.Lambda.TestTool.Tests.NET6
+namespace Amazon.Lambda.TestTool.Tests
 {
     public class LambdaAssemblyPathTests
     {
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/LoadLambdaFunctionTests.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/LoadLambdaFunctionTests.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/LoadLambdaFunctionTests.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/LoadLambdaFunctionTests.cs
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/NoUiStartupTests.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/NoUiStartupTests.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/NoUiStartupTests.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/NoUiStartupTests.cs
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/SampleRequestTests.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/SampleRequestTests.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/SampleRequestTests.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/SampleRequestTests.cs
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/SourceGeneratorTests.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/SourceGeneratorTests.cs
similarity index 88%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/SourceGeneratorTests.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/SourceGeneratorTests.cs
index e6d6bdfdc..d6e8d86e6 100644
--- a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/SourceGeneratorTests.cs
+++ b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/SourceGeneratorTests.cs
@@ -1,4 +1,4 @@
-namespace Amazon.Lambda.TestTool.Tests.NET6
+namespace Amazon.Lambda.TestTool.Tests
 {
     public class SourceGeneratorTests
     {
@@ -10,7 +10,7 @@ public void SourceGeneratorInputAndOutput()
                 Mode = TestToolStartup.RunConfiguration.RunMode.Test,
                 OutputWriter = new StringWriter()
             };
-            var buildPath = Path.GetFullPath($"../../../../LambdaFunctions/net6/SourceGeneratorExample/bin/Debug/net6.0");
+            var buildPath = Path.GetFullPath($"../../../../LambdaFunctions/SourceGeneratorExample/bin/Debug/{TestUtils.GetTargetFramework()}");
 
             TestToolStartup.Startup("Unit Tests", null, new string[] { "--path", buildPath, "--no-ui", "--payload", "{\"Name\" : \"FooBar\"}", "--config-file", "SourceGeneratorInputAndOutput.json" }, runConfiguration);
             Assert.Contains("Response = FooBar", runConfiguration.OutputWriter.ToString());
@@ -24,7 +24,7 @@ public void SourceGeneratorAsyncInputOnly()
                 Mode = TestToolStartup.RunConfiguration.RunMode.Test,
                 OutputWriter = new StringWriter()
             };
-            var buildPath = Path.GetFullPath($"../../../../LambdaFunctions/net6/SourceGeneratorExample/bin/Debug/net6.0");
+            var buildPath = Path.GetFullPath($"../../../../LambdaFunctions/SourceGeneratorExample/bin/Debug/{TestUtils.GetTargetFramework()}");
 
             TestToolStartup.Startup("Unit Tests", null, new string[] { "--path", buildPath, "--no-ui", "--payload", "{\"Name\" : \"FooBar\"}", "--config-file", "SourceGeneratorAsyncInputOnly.json" }, runConfiguration);
             Assert.Contains("Calling function with:", runConfiguration.OutputWriter.ToString());
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/TestFiles/MultipleDepsJsonFile/Dependency.txt b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestFiles/MultipleDepsJsonFile/Dependency.txt
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/TestFiles/MultipleDepsJsonFile/Dependency.txt
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestFiles/MultipleDepsJsonFile/Dependency.txt
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/TestFiles/MultipleDepsJsonFile/LambdaDemo.Api1.deps.json b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestFiles/MultipleDepsJsonFile/LambdaDemo.Api1.deps.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/TestFiles/MultipleDepsJsonFile/LambdaDemo.Api1.deps.json
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestFiles/MultipleDepsJsonFile/LambdaDemo.Api1.deps.json
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/TestFiles/MultipleDepsJsonFile/LambdaDemo.Api2.deps.json b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestFiles/MultipleDepsJsonFile/LambdaDemo.Api2.deps.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/TestFiles/MultipleDepsJsonFile/LambdaDemo.Api2.deps.json
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestFiles/MultipleDepsJsonFile/LambdaDemo.Api2.deps.json
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/TestFiles/MultipleDepsJsonFile/LambdaDemo.deps.json b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestFiles/MultipleDepsJsonFile/LambdaDemo.deps.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/TestFiles/MultipleDepsJsonFile/LambdaDemo.deps.json
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestFiles/MultipleDepsJsonFile/LambdaDemo.deps.json
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/TestFiles/SingleDepsJsonFile/LambdaDemo.deps.json b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestFiles/SingleDepsJsonFile/LambdaDemo.deps.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/TestFiles/SingleDepsJsonFile/LambdaDemo.deps.json
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestFiles/SingleDepsJsonFile/LambdaDemo.deps.json
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/TestUtils.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestUtils.cs
similarity index 85%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/TestUtils.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestUtils.cs
index 2b21b094f..23387ebf8 100644
--- a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/TestUtils.cs
+++ b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/TestUtils.cs
@@ -70,20 +70,23 @@ public static bool ProfileTestsEnabled
 
         public static string GetLambdaFunctionSourceFile(string projectName, string fileName)
         {
-#if NETCORE_2_1
-            return Path.GetFullPath($"../../../../LambdaFunctions/netcore21/{projectName}/{fileName}");
-#elif NETCORE_3_1
-            return Path.GetFullPath($"../../../../LambdaFunctions/netcore31/{projectName}/{fileName}");
-#endif            
+            return Path.GetFullPath($"../../../../LambdaFunctions/{projectName}/{fileName}");
         }
 
         public static string GetLambdaFunctionBuildPath(string projectName)
         {
-#if NETCORE_2_1
-            return Path.GetFullPath($"../../../../LambdaFunctions/netcore21/{projectName}/bin/Debug/netcoreapp2.1");
-#elif NETCORE_3_1
-            return Path.GetFullPath($"../../../../LambdaFunctions/netcore31/{projectName}/bin/Debug/netcoreapp3.1");
-#endif            
+            return Path.GetFullPath($"../../../../LambdaFunctions/{projectName}/bin/Debug/{GetTargetFramework()}");
+        }
+
+        public static string GetTargetFramework()
+        {
+#if NET6_0
+            return "net6.0";
+#elif NET8_0
+            return "net8.0";
+#else
+            Compile error you need to add a new target framework
+#endif
         }
     }
 }
\ No newline at end of file
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/Usings.cs b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/Usings.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NET6/Usings.cs
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/Usings.cs
diff --git a/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/call-valuescontroller-request.txt b/Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/call-valuescontroller-request.txt
similarity index 100%
rename from Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.Shared/call-valuescontroller-request.txt
rename to Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests/call-valuescontroller-request.txt
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/AspNetCoreAPIExample.csproj b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/AspNetCoreAPIExample.csproj
similarity index 84%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/AspNetCoreAPIExample.csproj
rename to Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/AspNetCoreAPIExample.csproj
index 619026897..985cf50bb 100644
--- a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/AspNetCoreAPIExample.csproj
+++ b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/AspNetCoreAPIExample.csproj
@@ -1,6 +1,6 @@
-
+
   
-    netcoreapp3.1
+    net6.0;net8.0
     true
     Lambda
     
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/Controllers/ValuesController.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/Controllers/ValuesController.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/Controllers/ValuesController.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/Controllers/ValuesController.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/FakeDependency.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/FakeDependency.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/FakeDependency.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/FakeDependency.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/LambdaEntryPoint.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/LambdaEntryPoint.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/LambdaEntryPoint.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/LambdaEntryPoint.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/LocalEntryPoint.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/LocalEntryPoint.cs
similarity index 63%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/LocalEntryPoint.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/LocalEntryPoint.cs
index 8dba94e0e..dd8c63772 100644
--- a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/LocalEntryPoint.cs
+++ b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/LocalEntryPoint.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
@@ -16,11 +17,11 @@ public static void Main(string[] args)
             CreateHostBuilder(args).Build().Run();
         }
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup();
-                });
+        public static WebApplicationBuilder CreateHostBuilder(string[] args)
+        {
+            var builder = WebApplication.CreateBuilder(args);
+            builder.WebHost.UseStartup();
+            return builder;
+        }
     }
 }
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/Readme.md b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/Readme.md
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/Readme.md
rename to Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/Readme.md
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/Startup.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/Startup.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/Startup.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/Startup.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/appsettings.Development.json b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/appsettings.Development.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/appsettings.Development.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/appsettings.Development.json
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/appsettings.json b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/appsettings.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/appsettings.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/appsettings.json
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/aws-lambda-tools-defaults.json b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/aws-lambda-tools-defaults.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/aws-lambda-tools-defaults.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/aws-lambda-tools-defaults.json
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/serverless.template b/Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/serverless.template
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/AspNetCoreAPIExample/serverless.template
rename to Tools/LambdaTestTool/tests/LambdaFunctions/AspNetCoreAPIExample/serverless.template
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/AsyncMethods.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/AsyncMethods.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/AsyncMethods.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/AsyncMethods.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/ErrorFunctions.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/ErrorFunctions.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/ErrorFunctions.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/ErrorFunctions.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/FunctionSignatureExamples.csproj b/Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/FunctionSignatureExamples.csproj
similarity index 90%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/FunctionSignatureExamples.csproj
rename to Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/FunctionSignatureExamples.csproj
index eea78b7d1..f8bd12dc2 100644
--- a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/FunctionSignatureExamples.csproj
+++ b/Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/FunctionSignatureExamples.csproj
@@ -1,6 +1,6 @@
 
   
-    netcoreapp3.1
+    net6.0;net8.0
     true
   
   
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/InstanceMethods.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/InstanceMethods.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/InstanceMethods.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/InstanceMethods.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/StaticMethods.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/StaticMethods.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/StaticMethods.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/StaticMethods.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/aws-lambda-tools-defaults.json b/Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/aws-lambda-tools-defaults.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/FunctionSignatureExamples/aws-lambda-tools-defaults.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/FunctionSignatureExamples/aws-lambda-tools-defaults.json
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/S3EventFunction/Function.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/S3EventFunction/Function.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/S3EventFunction/Function.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/S3EventFunction/Function.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/S3EventFunction/Readme.md b/Tools/LambdaTestTool/tests/LambdaFunctions/S3EventFunction/Readme.md
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/S3EventFunction/Readme.md
rename to Tools/LambdaTestTool/tests/LambdaFunctions/S3EventFunction/Readme.md
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/S3EventFunction/S3EventFunction.csproj b/Tools/LambdaTestTool/tests/LambdaFunctions/S3EventFunction/S3EventFunction.csproj
similarity index 91%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/S3EventFunction/S3EventFunction.csproj
rename to Tools/LambdaTestTool/tests/LambdaFunctions/S3EventFunction/S3EventFunction.csproj
index 27e6eef57..9c246d91b 100644
--- a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/S3EventFunction/S3EventFunction.csproj
+++ b/Tools/LambdaTestTool/tests/LambdaFunctions/S3EventFunction/S3EventFunction.csproj
@@ -1,7 +1,7 @@
 
 
   
-    netcoreapp3.1
+    net6.0;net8.0
     true
   
 
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/S3EventFunction/aws-lambda-tools-defaults.json b/Tools/LambdaTestTool/tests/LambdaFunctions/S3EventFunction/aws-lambda-tools-defaults.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/S3EventFunction/aws-lambda-tools-defaults.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/S3EventFunction/aws-lambda-tools-defaults.json
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/Functions/CreateItemFunction.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/Functions/CreateItemFunction.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/Functions/CreateItemFunction.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/Functions/CreateItemFunction.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/Functions/GetItemFunction.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/Functions/GetItemFunction.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/Functions/GetItemFunction.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/Functions/GetItemFunction.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/Functions/UpdateItemFunction.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/Functions/UpdateItemFunction.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/Functions/UpdateItemFunction.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/Functions/UpdateItemFunction.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/Program.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/Program.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/Program.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/Program.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/ServerlessFunctionTemplateYamlExample.csproj b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/ServerlessFunctionTemplateYamlExample.csproj
similarity index 96%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/ServerlessFunctionTemplateYamlExample.csproj
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/ServerlessFunctionTemplateYamlExample.csproj
index 2ce48636a..161f5ceb3 100644
--- a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/ServerlessFunctionTemplateYamlExample.csproj
+++ b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/ServerlessFunctionTemplateYamlExample.csproj
@@ -1,7 +1,7 @@
 
 
   
-    netcoreapp3.1
+    net6.0;net8.0
     true
     Lambda
   
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/Startup.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/Startup.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/Startup.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/Startup.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/aws-lambda-tools-defaults.json b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/aws-lambda-tools-defaults.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/aws-lambda-tools-defaults.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/aws-lambda-tools-defaults.json
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/env.configs.yml b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/env.configs.yml
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/env.configs.yml
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/env.configs.yml
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/serverless.yml b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/serverless.yml
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessFunctionTemplateYamlExample/serverless.yml
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessFunctionTemplateYamlExample/serverless.yml
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateExample/Functions.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateExample/Functions.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateExample/Functions.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateExample/Functions.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateExample/ServerlessTemplateExample.csproj b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateExample/ServerlessTemplateExample.csproj
similarity index 91%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateExample/ServerlessTemplateExample.csproj
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateExample/ServerlessTemplateExample.csproj
index a1c8ec607..47b338ce6 100644
--- a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateExample/ServerlessTemplateExample.csproj
+++ b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateExample/ServerlessTemplateExample.csproj
@@ -1,7 +1,7 @@
 
 
   
-    netcoreapp3.1
+    net6.0;net8.0
     true
   
 
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateExample/aws-lambda-tools-defaults.json b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateExample/aws-lambda-tools-defaults.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateExample/aws-lambda-tools-defaults.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateExample/aws-lambda-tools-defaults.json
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateExample/serverless.template b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateExample/serverless.template
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateExample/serverless.template
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateExample/serverless.template
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateYamlExample/Functions.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateYamlExample/Functions.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateYamlExample/Functions.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateYamlExample/Functions.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateYamlExample/ServerlessTemplateYamlExample.csproj b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateYamlExample/ServerlessTemplateYamlExample.csproj
similarity index 90%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateYamlExample/ServerlessTemplateYamlExample.csproj
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateYamlExample/ServerlessTemplateYamlExample.csproj
index b13de4b6f..50bf1f22e 100644
--- a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateYamlExample/ServerlessTemplateYamlExample.csproj
+++ b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateYamlExample/ServerlessTemplateYamlExample.csproj
@@ -1,7 +1,7 @@
 
 
   
-    netcoreapp3.1
+    net6.0;net8.0
     true
   
 
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateYamlExample/aws-lambda-tools-defaults.json b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateYamlExample/aws-lambda-tools-defaults.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateYamlExample/aws-lambda-tools-defaults.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateYamlExample/aws-lambda-tools-defaults.json
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateYamlExample/serverless.yaml b/Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateYamlExample/serverless.yaml
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ServerlessTemplateYamlExample/serverless.yaml
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ServerlessTemplateYamlExample/serverless.yaml
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/net6/SourceGeneratorExample/Function.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/SourceGeneratorExample/Function.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/net6/SourceGeneratorExample/Function.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/SourceGeneratorExample/Function.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/net6/SourceGeneratorExample/SourceGeneratorAsyncInputOnly.json b/Tools/LambdaTestTool/tests/LambdaFunctions/SourceGeneratorExample/SourceGeneratorAsyncInputOnly.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/net6/SourceGeneratorExample/SourceGeneratorAsyncInputOnly.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/SourceGeneratorExample/SourceGeneratorAsyncInputOnly.json
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/net6/SourceGeneratorExample/SourceGeneratorExample.csproj b/Tools/LambdaTestTool/tests/LambdaFunctions/SourceGeneratorExample/SourceGeneratorExample.csproj
similarity index 91%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/net6/SourceGeneratorExample/SourceGeneratorExample.csproj
rename to Tools/LambdaTestTool/tests/LambdaFunctions/SourceGeneratorExample/SourceGeneratorExample.csproj
index 786c2c9c1..ddbfa1ba0 100644
--- a/Tools/LambdaTestTool/tests/LambdaFunctions/net6/SourceGeneratorExample/SourceGeneratorExample.csproj
+++ b/Tools/LambdaTestTool/tests/LambdaFunctions/SourceGeneratorExample/SourceGeneratorExample.csproj
@@ -1,8 +1,7 @@
 
   
-    net6.0
+    net6.0;net8.0
     enable
-    enable
     true
     Lambda
     
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/net6/SourceGeneratorExample/SourceGeneratorInputAndOutput.json b/Tools/LambdaTestTool/tests/LambdaFunctions/SourceGeneratorExample/SourceGeneratorInputAndOutput.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/net6/SourceGeneratorExample/SourceGeneratorInputAndOutput.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/SourceGeneratorExample/SourceGeneratorInputAndOutput.json
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/Function.cs b/Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/Function.cs
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/Function.cs
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/Function.cs
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/Readme.md b/Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/Readme.md
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/Readme.md
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/Readme.md
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/ToUpperFunc.csproj b/Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/ToUpperFunc.csproj
similarity index 89%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/ToUpperFunc.csproj
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/ToUpperFunc.csproj
index e2a97df11..c7bbd56e4 100644
--- a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/ToUpperFunc.csproj
+++ b/Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/ToUpperFunc.csproj
@@ -1,7 +1,7 @@
 
 
   
-    netcoreapp3.1
+    net6.0;net8.0
     true
   
 
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/aws-lambda-tools-defaults.json b/Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/aws-lambda-tools-defaults.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/aws-lambda-tools-defaults.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/aws-lambda-tools-defaults.json
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/payload-sample.json b/Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/payload-sample.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/payload-sample.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/payload-sample.json
diff --git a/Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/stream-function.json b/Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/stream-function.json
similarity index 100%
rename from Tools/LambdaTestTool/tests/LambdaFunctions/netcore31/ToUpperFunc/stream-function.json
rename to Tools/LambdaTestTool/tests/LambdaFunctions/ToUpperFunc/stream-function.json
diff --git a/buildtools/build.proj b/buildtools/build.proj
index 8be09023c..e7552c3e0 100644
--- a/buildtools/build.proj
+++ b/buildtools/build.proj
@@ -168,11 +168,10 @@
         
     
     
-        
-        
-				
+        	
 				
-			
+		
+				
     
     
         
@@ -181,17 +180,17 @@
         
             dotnet test
         
-		
+		
     
         
         
             dotnet test
         
-		
+		
     
     
-        
-        
+        
+