Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add NET 9 to fix Lambda custom runtime image #1890

Merged
merged 3 commits into from
Nov 29, 2024
Merged

fix: add NET 9 to fix Lambda custom runtime image #1890

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a14c32
fix: add NET 9 to fix Lambda custom runtime image
philasmar Nov 29, 2024
d9e1050
chore: add License URL to projects that don't have it
philasmar Nov 29, 2024
824d029
replied to norms comment
philasmar Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .autover/autover.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@
{
"Name": "Amazon.Lambda.Templates",
"Path": "Blueprints/BlueprintDefinitions/vs2022/Templates.csproj"
},
{
"Name": "SnapshotRestore.Registry",
"Path": "Libraries/src/SnapshotRestore.Registry/SnapshotRestore.Registry.csproj"
}
],
"UseCommitsForChangelog": false,
Expand Down
11 changes: 11 additions & 0 deletions .autover/changes/2685eba0-7e2e-4bb7-aa6c-4a237434d388.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"Projects": [
{
"Name": "SnapshotRestore.Registry",
"Type": "Patch",
"ChangelogMessages": [
"Added License URL to project"
]
}
]
}
11 changes: 11 additions & 0 deletions .autover/changes/27878e75-1d65-4334-b3cc-fb79a84f9456.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"Projects": [
{
"Name": "Amazon.Lambda.RuntimeSupport",
"Type": "Patch",
"ChangelogMessages": [
"Updated project to support building the .NET 9 Lambda custom runtime image"
]
}
]
}
11 changes: 11 additions & 0 deletions .autover/changes/40379e2a-29d6-4e86-a7c8-af98eacf5dd9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"Projects": [
{
"Name": "Amazon.Lambda.Annotations",
"Type": "Patch",
"ChangelogMessages": [
"Added License URL to project"
]
}
]
}
11 changes: 11 additions & 0 deletions .autover/changes/b9c57497-1ab4-4d26-8cc6-6aa945f7ac96.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"Projects": [
{
"Name": "SnapshotRestore.Registry",
"Type": "Patch",
"ChangelogMessages": [
"Updated project to support building the .NET 9 Lambda custom runtime image"
]
}
]
}
1 change: 1 addition & 0 deletions ...mazon.Lambda.Annotations.SourceGenerator/Amazon.Lambda.Annotations.SourceGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<PackageProjectUrl>https://github.com/aws/aws-lambda-dotnet</PackageProjectUrl>
<PackageIcon>images\icon.png</PackageIcon>
<PackageReadmeFile>docs\README.md</PackageReadmeFile>
<PackageLicenseUrl>https://aws.amazon.com/apache2.0/</PackageLicenseUrl>

<!--This assembly needs to access internal methods inside the Amazon.Lambda.Annotations assembly.
Both these assemblies need to be strongly signed for the InternalsVisibleTo attribute to take effect.-->
Expand Down
6 changes: 3 additions & 3 deletions Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\buildtools\common.props" />

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

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0'">
<WarningsAsErrors>IL2026,IL2067,IL2075</WarningsAsErrors>
<IsTrimmable>true</IsTrimmable>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
Expand All @@ -41,7 +41,7 @@
<ItemGroup>
<ProjectReference Include="..\Amazon.Lambda.Core\Amazon.Lambda.Core.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0'">
<ProjectReference Include="..\SnapshotRestore.Registry\SnapshotRestore.Registry.csproj" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion Libraries/src/SnapshotRestore.Registry/SnapshotRestore.Registry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\..\..\buildtools\common.props" />

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<VersionPrefix>1.0.0</VersionPrefix>
<Description>Provides a Restore Hooks library to help you register before snapshot and after restore hooks.</Description>
<AssemblyTitle>SnapshotRestore.Registry</AssemblyTitle>
Expand Down
2 changes: 1 addition & 1 deletion buildtools/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/aws/aws-lambda-dotnet</PackageProjectUrl>
<PackageLicenseUrl>http://aws.amazon.com/apache2.0/</PackageLicenseUrl>
<PackageLicenseUrl>https://aws.amazon.com/apache2.0/</PackageLicenseUrl>
philasmar marked this conversation as resolved.
Show resolved Hide resolved


<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
Expand Down
Loading