Skip to content

Commit e36bd5d

Browse files
normjnormj
committed
Merge branch 'master' into feature/structured-logging
2 parents 974ab08 + 773ec7a commit e36bd5d

File tree

89 files changed

+196
-125
lines changed

Some content is hidden

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

89 files changed

+196
-125
lines changed

‎.github/workflows/update-Dockerfiles.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ jobs:
6161
# Steps represent a sequence of tasks that will be executed as part of the job
6262
steps:
6363
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
64-
- uses: actions/checkout@v2
64+
- uses: actions/checkout@v4
65+
with:
66+
ref: 'dev'
6567

6668
- name: Update .NET 6 AMD64
6769
id: update-net6-amd64
@@ -118,7 +120,7 @@ jobs:
118120
git add "**/*Dockerfile"
119121
git commit -m "chore: ASP.NET Core version update in Dockerfiles"
120122
git push origin $branch
121-
echo "BRANCH=$branch" >> $GITHUB_OUTPUT
123+
Add-Content -Path $env:GITHUB_OUTPUT -Value "BRANCH=$branch"
122124
123125
# Create a Pull Request from the pushed branch
124126
- name: Pull Request
@@ -127,7 +129,7 @@ jobs:
127129
uses: repo-sync/pull-request@v2
128130
with:
129131
source_branch: ${{ steps.commit-push.outputs.BRANCH }}
130-
destination_branch: "master"
132+
destination_branch: "dev"
131133
pr_title: 'chore: ASP.NET Core version update in Dockerfiles'
132134
pr_body: "This PR updates the Dockerfiles to use the latest ASP.NET Core version.
133135
Verify listed Dockerfiles that they have correct version and matching SHA512 checksum for ASP.NET Core runtime.
@@ -136,12 +138,12 @@ jobs:
136138
\n${{ format
137139
(
138140
'{0}\n{1}\n{2}\n{3}\n{4}\n{5}',
139-
join(steps.update-net6-amd64.outputs.*, '\n'),
140-
join(steps.update-net6-arm64.outputs.*, '\n'),
141-
join(steps.update-net7-amd64.outputs.*, '\n'),
142-
join(steps.update-net7-arm64.outputs.*, '\n'),
143-
join(steps.update-net8-amd64.outputs.*, '\n'),
144-
join(steps.update-net8-arm64.outputs.*, '\n')
141+
join(steps.update-net6-amd64.outputs.MESSAGE, '\n'),
142+
join(steps.update-net6-arm64.outputs.MESSAGE, '\n'),
143+
join(steps.update-net7-amd64.outputs.MESSAGE, '\n'),
144+
join(steps.update-net7-arm64.outputs.MESSAGE, '\n'),
145+
join(steps.update-net8-amd64.outputs.MESSAGE, '\n'),
146+
join(steps.update-net8-arm64.outputs.MESSAGE, '\n')
145147
)
146148
}}"
147149
github_token: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
1616
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
1717
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.1" />
18-
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.2.0" />
18+
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.3.0" />
1919
</ItemGroup>
2020
<!--
2121
The FrameworkReference is used to reduce the deployment bundle size by not having to include

‎Blueprints/BlueprintDefinitions/vs2022/EmptyServerless-Image/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.Annotations" Version="1.2.0" />
14+
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.3.0" />
1515
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
1616
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.1" />
1717
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />

‎Blueprints/BlueprintDefinitions/vs2022/EmptyServerless-Image/template/src/BlueprintBaseName.1/Functions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public Functions()
3434
/// </remarks>
3535
/// <param name="context">Information about the invocation, function, and execution environment</param>
3636
/// <returns>The response as an implicit <see cref="APIGatewayProxyResponse"/></returns>
37-
[LambdaFunction(PackageType = LambdaPackageType.Image, Policies = "AWSLambdaBasicExecutionRole", MemorySize = 512, Timeout = 30)]
37+
[LambdaFunction(PackageType = LambdaPackageType.Image)]
3838
[RestApi(LambdaHttpMethod.Get, "/")]
3939
public IHttpResult Get(ILambdaContext context)
4040
{

‎Blueprints/BlueprintDefinitions/vs2022/EmptyServerless/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.Annotations" Version="1.2.0" />
14+
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.3.0" />
1515
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
1616
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.1" />
1717
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />

‎Blueprints/BlueprintDefinitions/vs2022/EmptyServerless/template/src/BlueprintBaseName.1/Functions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public Functions()
3434
/// </remarks>
3535
/// <param name="context">Information about the invocation, function, and execution environment</param>
3636
/// <returns>The response as an implicit <see cref="APIGatewayProxyResponse"/></returns>
37-
[LambdaFunction(Policies = "AWSLambdaBasicExecutionRole", MemorySize = 512, Timeout = 30)]
37+
[LambdaFunction]
3838
[RestApi(LambdaHttpMethod.Get, "/")]
3939
public IHttpResult Get(ILambdaContext context)
4040
{

‎Blueprints/BlueprintDefinitions/vs2022/MessageProcessingFramework/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.Annotations" Version="1.2.0" />
14+
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.3.0" />
1515
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
1616
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.1" />
1717
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />

‎Blueprints/BlueprintDefinitions/vs2022/MessageProcessingFramework/template/src/BlueprintBaseName.1/serverless.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"Properties": {
1515
"Runtime": "dotnet8",
1616
"CodeUri": ".",
17-
"MemorySize": 256,
17+
"MemorySize": 512,
1818
"Timeout": 30,
1919
"Policies": [
2020
"AWSLambdaSQSQueueExecutionRole"
@@ -47,7 +47,7 @@
4747
"Properties": {
4848
"Runtime": "dotnet8",
4949
"CodeUri": ".",
50-
"MemorySize": 256,
50+
"MemorySize": 512,
5151
"Timeout": 30,
5252
"Policies": [
5353
"AmazonSQSFullAccess"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.10.0" />
2121
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
2222
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.1" />
23-
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.2.0" />
23+
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.3.0" />
2424
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
2525
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
2626
</ItemGroup>

‎Blueprints/BlueprintDefinitions/vs2022/NativeAOTServerless/template/src/BlueprintBaseName.1/Functions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class Functions
4242
/// </summary>
4343
/// <param name="context">The ILambdaContext that provides methods for logging and describing the Lambda environment.</param>
4444
/// <returns></returns>
45-
[LambdaFunction(MemorySize = 512)]
45+
[LambdaFunction]
4646
[RestApi(LambdaHttpMethod.Get, "/")]
4747
public IHttpResult GetFunctionHandler(ILambdaContext context)
4848
{
@@ -58,7 +58,7 @@ public IHttpResult GetFunctionHandler(ILambdaContext context)
5858
/// <param name="product">The new product to post to the system.</param>
5959
/// <param name="context">The ILambdaContext that provides methods for logging and describing the Lambda environment.</param>
6060
/// <returns></returns>
61-
[LambdaFunction(MemorySize = 512)]
61+
[LambdaFunction]
6262
[RestApi(LambdaHttpMethod.Post, "/")]
6363
public IHttpResult PostFunctionHandler([FromBody] NewProductDTO product, ILambdaContext context)
6464
{
@@ -77,7 +77,7 @@ public IHttpResult PostFunctionHandler([FromBody] NewProductDTO product, ILambda
7777
/// using the AWS SDKs.
7878
/// </summary>
7979
/// <returns></returns>
80-
[LambdaFunction(MemorySize = 512)]
80+
[LambdaFunction]
8181
public async Task<string> GetCallingIPAsync(ILambdaContext context)
8282
{
8383
context.Logger.LogInformation("Checking IP address");

‎Blueprints/BlueprintDefinitions/vs2022/template.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Amazon.Lambda.Templates</id>
5-
<version>7.1.0</version>
5+
<version>7.1.1</version>
66
<authors>Amazon Web Services</authors>
77
<tags>AWS Amazon Lambda</tags>
88
<description>AWS Lambda templates for Microsoft Template Engine accessible with the dotnet CLI's new command</description>

‎LambdaRuntimeDockerfiles/Images/net6/amd64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
22

3-
ARG ASPNET_VERSION=6.0.28
4-
ARG ASPNET_SHA512=52675b81e026b4b673aedb2d9ee99a79ccb47eab090a059ef9b95615befc034ef7fbe674b01ae813870f73dcdbcfa32906969860a464aa5d356c004b6bfb201b
3+
ARG ASPNET_VERSION=6.0.29
4+
ARG ASPNET_SHA512=6dc21e1a8dd597df9c1135065f7350bbde9cc040c3079ec7850b0e5f254051b883c6c6e0056682d2963ec74dadff8eb32d82c13b35c9088f3d7c055d3d3f0863
55

66
ARG LAMBDA_RUNTIME_NAME=dotnet6
77
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2

‎LambdaRuntimeDockerfiles/Images/net6/arm64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
22

3-
ARG ASPNET_VERSION=6.0.28
4-
ARG ASPNET_SHA512=932773d9aecfe3918c0479f44d5ca7d643cc7bbe632421ea78326605dd374e9df904f49a2c4279cab0af16be55f41c8fb8e04590aef55ce13c728f9a64d3015f
3+
ARG ASPNET_VERSION=6.0.29
4+
ARG ASPNET_SHA512=6e4a504f37ba4bf7d0316d2a3077c5088962c8b8445b659fa05844697bd11427afabacb6fee34094aa4313dd6dca70c862c1c68b30731b12b4451bd59067bc8f
55

66
ARG ICU_VERSION=68.1
77
ARG ICU_MD5=6a99b541ea01f271257b121a4433c7c0

‎LambdaRuntimeDockerfiles/Images/net7/amd64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
22

3-
ARG ASPNET_VERSION=7.0.17
4-
ARG ASPNET_SHA512=a0cc7f76f24d123fbe787ff3b554736000c3f6b4f7b919819fb3039f6df4a15d28713a0a169c9493012e14afc3a0299f3d800d93d6749a70b567833ef3f3aeed
3+
ARG ASPNET_VERSION=7.0.18
4+
ARG ASPNET_SHA512=d2c3af93b9b8280c4e519f052f443e0504ccf7a04b3eef60500b2e3a8874a60a3a545ca936f8433887bfa6388106c19283c5a6a2c78ffdc19889bde3edbefbda
55

66
ARG LAMBDA_RUNTIME_NAME=dotnet7
77
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2

‎LambdaRuntimeDockerfiles/Images/net7/arm64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
22

3-
ARG ASPNET_VERSION=7.0.17
4-
ARG ASPNET_SHA512=a5b6c6a262334506675447d157d7b4e5683c77715b74f97c9b219166bf9226a20d5194ff1c5eb8e17b625a17f8fd114da4b44ad19888760956ff735facd1d41e
3+
ARG ASPNET_VERSION=7.0.18
4+
ARG ASPNET_SHA512=62bc42a8d094be8253be90acba02253c27afb1eb6b06976c3adea74f967f522bf7938eaed25c824d6e36a9fb71f7248ba315cc67577a3c7fb73b0d3d7a41ecac
55

66
ARG ICU_VERSION=68.1
77
ARG ICU_MD5=6a99b541ea01f271257b121a4433c7c0

‎LambdaRuntimeDockerfiles/Images/net8/amd64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
22

3-
ARG ASPNET_VERSION=8.0.3
4-
ARG ASPNET_SHA512=73a16e08402989f25ca780acc981c2ae3a41ef39b4bb6b6b4962053144b6eda7c175fdd5ee3c25bcd0c86a27d1a83d4f8b9b2f69f37d4e3972f5901a9e0600b6
3+
ARG ASPNET_VERSION=8.0.4
4+
ARG ASPNET_SHA512=8ab281977116bf59a672afe5463bce4433378cc8a67d332c564a012939b7dbdd8756df82a115a5ab93f8186c22700a6dc0272b99a0f484db837da96820c78e79
55

66
ARG LAMBDA_RUNTIME_NAME=dotnet8
77
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2023

‎LambdaRuntimeDockerfiles/Images/net8/arm64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
22

3-
ARG ASPNET_VERSION=8.0.3
4-
ARG ASPNET_SHA512=2ddf440be273febae8049df9b2837fe9b9d95d43a31898b915dbf39aedaf15a291ff28711e983fe099ab22a291ad244813256d57ebb6ef1fb94f04d712a96435
3+
ARG ASPNET_VERSION=8.0.4
4+
ARG ASPNET_SHA512=0b0b3dffe678211afcaeca5d7e381f2218f156421c79dd06e083b1abd92ceb2b5c04c8a159b7d67b866393b8169de826ede70240226e0164451b329b7d46b570
55

66
ARG LAMBDA_RUNTIME_NAME=dotnet8
77
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2023

‎LambdaRuntimeDockerfiles/update-dockerfile.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ function Update-Dockerfile ([string]$DockerfilePath, [string]$NextVersion) {
2626

2727
# This allows checksumring the $DockerfilePath variable between steps
2828
# which is needed to update the description of the PR
29-
Write-Host "::set-output name=${DockerfilePath}::- Updated ${DockerfilePath} to ${NextVersion}<br> - Artifact: ${artifact}<br> - Checksum Source: ${checksumUri}"
29+
$message = "- Updated ${DockerfilePath} to ${NextVersion}<br> - Artifact: ${artifact}<br> - Checksum Source: ${checksumUri}"
30+
Add-Content -Path $env:GITHUB_OUTPUT -Value "MESSAGE=$message"
3031
}
3132

3233
# Returns Checksum of given ASP.NET Core version from the give Checksum file

‎Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Amazon.Lambda.Annotations.SourceGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<AssemblyVersion>1.3.0</AssemblyVersion>
4+
<AssemblyVersion>1.3.1</AssemblyVersion>
55
<TargetFramework>netstandard2.0</TargetFramework>
66

77
<!-- This is required to allow copying all the dependencies to bin directory which can be copied after to nuget package based on nuspec -->

0 commit comments

Comments
 (0)