Skip to content

Commit c7f0759

Browse files
authored
fix: add NET 9 to fix Lambda custom runtime image (#1890)
* fix: add NET 9 to fix Lambda custom runtime image * chore: add License URL to projects that don't have it
1 parent 6732523 commit c7f0759

File tree

9 files changed

+56
-5
lines changed

9 files changed

+56
-5
lines changed

.autover/autover.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@
131131
{
132132
"Name": "Amazon.Lambda.Templates",
133133
"Path": "Blueprints/BlueprintDefinitions/vs2022/Templates.csproj"
134+
},
135+
{
136+
"Name": "SnapshotRestore.Registry",
137+
"Path": "Libraries/src/SnapshotRestore.Registry/SnapshotRestore.Registry.csproj"
134138
}
135139
],
136140
"UseCommitsForChangelog": false,
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"Projects": [
3+
{
4+
"Name": "SnapshotRestore.Registry",
5+
"Type": "Patch",
6+
"ChangelogMessages": [
7+
"Added License URL to project"
8+
]
9+
}
10+
]
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"Projects": [
3+
{
4+
"Name": "Amazon.Lambda.RuntimeSupport",
5+
"Type": "Patch",
6+
"ChangelogMessages": [
7+
"Updated project to support building the .NET 9 Lambda custom runtime image"
8+
]
9+
}
10+
]
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"Projects": [
3+
{
4+
"Name": "Amazon.Lambda.Annotations",
5+
"Type": "Patch",
6+
"ChangelogMessages": [
7+
"Added License URL to project"
8+
]
9+
}
10+
]
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"Projects": [
3+
{
4+
"Name": "SnapshotRestore.Registry",
5+
"Type": "Patch",
6+
"ChangelogMessages": [
7+
"Updated project to support building the .NET 9 Lambda custom runtime image"
8+
]
9+
}
10+
]
11+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<PackageProjectUrl>https://github.com/aws/aws-lambda-dotnet</PackageProjectUrl>
1010
<PackageIcon>images\icon.png</PackageIcon>
1111
<PackageReadmeFile>docs\README.md</PackageReadmeFile>
12+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1213

1314
<!--This assembly needs to access internal methods inside the Amazon.Lambda.Annotations assembly.
1415
Both these assemblies need to be strongly signed for the InternalsVisibleTo attribute to take effect.-->

Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\buildtools\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netstandard2.0;net5.0;net6.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net9.0</TargetFrameworks>
77
<Version>1.12.1</Version>
88
<Description>Provides a bootstrap and Lambda Runtime API Client to help you to develop custom .NET Core Lambda Runtimes.</Description>
99
<AssemblyTitle>Amazon.Lambda.RuntimeSupport</AssemblyTitle>
@@ -20,7 +20,7 @@
2020
<OutputType>Exe</OutputType>
2121
</PropertyGroup>
2222

23-
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
23+
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0'">
2424
<WarningsAsErrors>IL2026,IL2067,IL2075</WarningsAsErrors>
2525
<IsTrimmable>true</IsTrimmable>
2626
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
@@ -41,7 +41,7 @@
4141
<ItemGroup>
4242
<ProjectReference Include="..\Amazon.Lambda.Core\Amazon.Lambda.Core.csproj" />
4343
</ItemGroup>
44-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
44+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0'">
4545
<ProjectReference Include="..\SnapshotRestore.Registry\SnapshotRestore.Registry.csproj" />
4646
</ItemGroup>
4747
<ItemGroup>

Libraries/src/SnapshotRestore.Registry/SnapshotRestore.Registry.csproj

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

3+
<Import Project="..\..\..\buildtools\common.props" />
4+
35
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
57
<VersionPrefix>1.0.0</VersionPrefix>
68
<Description>Provides a Restore Hooks library to help you register before snapshot and after restore hooks.</Description>
79
<AssemblyTitle>SnapshotRestore.Registry</AssemblyTitle>

buildtools/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
1515
<PackageProjectUrl>https://github.com/aws/aws-lambda-dotnet</PackageProjectUrl>
16-
<PackageLicenseUrl>http://aws.amazon.com/apache2.0/</PackageLicenseUrl>
16+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1717

1818

1919
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

0 commit comments

Comments
 (0)