Skip to content

Commit f99e0b2

Browse files
normjnormj
authored
Update project templates to target upcoming .NET 10 support (#2218)
* Initial copy of VS 2022 blueprints to VS 2026 folder * Update TargetFramework and Lambda Runtime monikers to net10.0 and dotnet10 respectively * Move .template.config to src/BlueprintBaseName.1 directory so the dotnet new experience only creates the Lambda function in the target directory * Add File-based Function template * Update VS blueprint package to not include in the src zip .template.config directory now that it has been moved into the src. Also make sure any file-based blueprints are always excluded for the VS packaging. * Update all package references using the BlueprintPackager * Update build target for instantiated and building the templates to include the VS 2026. Also addressed compiler warnings that came up while building the issues. * Update change file to include entry for the new C# file-based template. * Update web static content in ASP.NET Core Web APp template * Add back dependency for blueprint msbuild target * Updated container images to use public.ecr.aws/lambda/dotnet:10 as the base image * Add specific version number of Amazon.Lambda.Tools to use for C# file-based * Update package references. Most important including the latest Amazon.Lambda.Annotations that has support for .NET 10.
1 parent 5cd714c commit f99e0b2

File tree

609 files changed

+99883
-358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

609 files changed

+99883
-358
lines changed

‎.autover/changes/e90fda4d-97af-48f4-af11-8c7e794a7076.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"Projects": [
3+
{
4+
"Name": "Amazon.Lambda.Templates",
5+
"Type": "Major",
6+
"ChangelogMessages": [
7+
"Update templates to target .NET 10",
8+
"Add new lambda.FileBased template for C# file-based Lambda functions",
9+
"Lambda projects will now be created directly in output directory instead of under src/<name>",
10+
"Removed xUnit test projects to allow Lambda projects to be created in output directory",
11+
"Removed lambda.OrderFlowersChatbot and lambda.LexBookTripSample templates"
12+
]
13+
}
14+
]
15+
}

‎Blueprints/BlueprintDefinitions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<PublishReadyToRun>true</PublishReadyToRun>
1313
</PropertyGroup>
1414
<ItemGroup>
15-
<PackageReference Include="Amazon.Lambda.Core" Version="2.7.0" />
16-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
15+
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
16+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
1717
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
18-
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.7.0" />
18+
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.8.0" />
1919
</ItemGroup>
2020
<!--
2121
The FrameworkReference is used to reduce the deployment bundle size by not having to include

‎Blueprints/BlueprintDefinitions/vs2022/AnnotationsFramework/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<IsTestProject>true</IsTestProject>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Amazon.Lambda.Core" Version="2.7.0" />
10-
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="3.0.0" />
11-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13-
<PackageReference Include="xunit" Version="2.9.2" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
9+
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
10+
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="3.0.1" />
11+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
13+
<PackageReference Include="xunit" Version="2.9.3" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
1515
<PackageReference Include="Moq" Version="4.20.72" />
1616
</ItemGroup>
1717
<ItemGroup>

‎Blueprints/BlueprintDefinitions/vs2022/AspNetCoreWebAPI-FSharp/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.fsproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
</Content>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Amazon.Lambda.Core" Version="2.7.0" />
19-
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="3.0.0" />
20-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
22-
<PackageReference Include="xunit" Version="2.9.2" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
18+
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
19+
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="3.0.1" />
20+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
22+
<PackageReference Include="xunit" Version="2.9.3" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
2424
</ItemGroup>
2525
<ItemGroup>
2626
<ProjectReference Include="..\..\src\BlueprintBaseName.1\BlueprintBaseName.1.fsproj" />

‎Blueprints/BlueprintDefinitions/vs2022/AspNetCoreWebAPI-Image-FSharp/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.fsproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
</Content>
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Amazon.Lambda.Core" Version="2.7.0" />
18-
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="3.0.0" />
19-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
21-
<PackageReference Include="xunit" Version="2.9.2" />
22-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
17+
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
18+
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="3.0.1" />
19+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
21+
<PackageReference Include="xunit" Version="2.9.3" />
22+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<ProjectReference Include="..\..\src\BlueprintBaseName.1\BlueprintBaseName.1.fsproj" />

‎Blueprints/BlueprintDefinitions/vs2022/AspNetCoreWebAPI-Image/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
</Content>
1818
</ItemGroup>
1919
<ItemGroup>
20-
<PackageReference Include="Amazon.Lambda.Core" Version="2.7.0" />
21-
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="3.0.0" />
22-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
20+
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
21+
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="3.0.1" />
22+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
2323
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.1" />
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
25-
<PackageReference Include="xunit" Version="2.9.2" />
26-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
25+
<PackageReference Include="xunit" Version="2.9.3" />
26+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<ProjectReference Include="..\..\src\BlueprintBaseName.1\BlueprintBaseName.1.csproj" />

‎Blueprints/BlueprintDefinitions/vs2022/AspNetCoreWebAPI/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
</Content>
1818
</ItemGroup>
1919
<ItemGroup>
20-
<PackageReference Include="Amazon.Lambda.Core" Version="2.7.0" />
21-
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="3.0.0" />
22-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
20+
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
21+
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="3.0.1" />
22+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
2323
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.0.1" />
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
25-
<PackageReference Include="xunit" Version="2.9.2" />
26-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
25+
<PackageReference Include="xunit" Version="2.9.3" />
26+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<ProjectReference Include="..\..\src\BlueprintBaseName.1\BlueprintBaseName.1.csproj" />

‎Blueprints/BlueprintDefinitions/vs2022/ChatBotTutorial/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PublishReadyToRun>true</PublishReadyToRun>
1212
</PropertyGroup>
1313
<ItemGroup>
14-
<PackageReference Include="Amazon.Lambda.Core" Version="2.7.0" />
14+
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
1515
<PackageReference Include="Amazon.Lambda.LexEvents" Version="3.1.0" />
1616
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
1717
</ItemGroup>

‎Blueprints/BlueprintDefinitions/vs2022/ChatBotTutorial/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
</None>
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Amazon.Lambda.Core" Version="2.7.0" />
18-
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="3.0.0" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
20-
<PackageReference Include="xunit" Version="2.9.2" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
17+
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
18+
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="3.0.1" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
20+
<PackageReference Include="xunit" Version="2.9.3" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
2222
</ItemGroup>
2323
<ItemGroup>
2424
<ProjectReference Include="..\..\src\BlueprintBaseName.1\BlueprintBaseName.1.csproj" />

‎Blueprints/BlueprintDefinitions/vs2022/CustomRuntimeFunction-FSharp/template/src/BlueprintBaseName.1/BlueprintBaseName.1.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
3232
</ItemGroup>
3333
<ItemGroup>
34-
<PackageReference Include="Amazon.Lambda.Core" Version="2.7.0" />
35-
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.13.1" />
34+
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
35+
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
3636
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
3737
</ItemGroup>
3838
<ItemGroup>

0 commit comments

Comments
 (0)