Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions .github/workflows/publish-artifacts-examples-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,18 @@ jobs:
packageName=$(basename $package .nupkg | sed -E 's/(.*)\.([0-9]+\.[0-9]+\.[0-9]+.*)$/\1/')
packageVersion=$(basename $package .nupkg | sed -E 's/(.*)\.([0-9]+\.[0-9]+\.[0-9]+.*)$/\2/')

# Check if project references this package
# Check if project references this package via PackageReference
if grep -q "<PackageReference.*Include=\"$packageName\"" "$project"; then
echo " - Updating $packageName to version $packageVersion"
# Use --no-restore to avoid restoring during each add
echo " - Updating PackageReference $packageName to version $packageVersion"
dotnet add "$project" package "$packageName" --version "$packageVersion" --source "local" --no-restore
fi

# Check if project references this package via ProjectReference and convert to PackageReference
if grep -q "<ProjectReference.*$packageName\.csproj" "$project"; then
echo " - Converting ProjectReference $packageName to PackageReference version $packageVersion"
# Remove the ProjectReference line
sed -i "/<ProjectReference.*$packageName\.csproj/d" "$project"
# Add PackageReference
dotnet add "$project" package "$packageName" --version "$packageVersion" --source "local" --no-restore
fi
done
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/logger/aot.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public partial class LambdaFunctionJsonSerializerContext : JsonSerializerContext

<ItemGroup>
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.12.0"/>
<PackageReference Include="Amazon.Lambda.Core" Version="2.5.0"/>
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0"/>
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="2.0.0"/>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion docs/migration-guide-v3.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Migrate from AWS SDK v3 to v4. Update package references in your `.csproj`:
**After (v3):**
```xml
<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.7.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="AWSSDK.Core" Version="4.0.*" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.*" />
<PackageReference Include="AWSSDK.S3" Version="4.0.*" />
Expand Down
4 changes: 3 additions & 1 deletion examples/AOT/AOT_Logging/src/AOT_Logging/AOT_Logging.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
</ItemGroup>
</Project>
4 changes: 3 additions & 1 deletion examples/AOT/AOT_Metrics/src/AOT_Metrics/AOT_Metrics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
<PackageReference Include="AWS.Lambda.Powertools.Metrics" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\libraries\src\AWS.Lambda.Powertools.Metrics\AWS.Lambda.Powertools.Metrics.csproj" />
</ItemGroup>
</Project>
4 changes: 3 additions & 1 deletion examples/AOT/AOT_Tracing/src/AOT_Tracing/AOT_Tracing.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
<PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\libraries\src\AWS.Lambda.Powertools.Tracing\AWS.Lambda.Powertools.Tracing.csproj" />
</ItemGroup>
</Project>
5 changes: 2 additions & 3 deletions examples/BatchProcessing/src/HelloWorld/HelloWorld.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
<!-- <PackageReference Include="AWS.Lambda.Powertools.BatchProcessing" Version="3.0.0" />-->
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.BatchProcessing\AWS.Lambda.Powertools.BatchProcessing.csproj" />
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.BatchProcessing\AWS.Lambda.Powertools.BatchProcessing.csproj" />
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.12.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.5.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
<PackageReference Include="AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction" Version="1.0.0-alpha.3" />
<PackageReference Include="AWSSDK.GeoPlaces" Version="4.0.0.4" />
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\libraries\src\AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction\AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.csproj" />
<ProjectReference Include="..\..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
</ItemGroup>
</Project>
6 changes: 4 additions & 2 deletions examples/Idempotency/src/HelloWorld/HelloWorld.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
<PackageReference Include="AWS.Lambda.Powertools.Idempotency" Version="3.0.2" />
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Idempotency\AWS.Lambda.Powertools.Idempotency.csproj" />
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
</ItemGroup>
</Project>
6 changes: 4 additions & 2 deletions examples/Kafka/Avro/src/Avro.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
<PackageReference Include="AWS.Lambda.Powertools.Kafka.Avro" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Kafka.Avro\AWS.Lambda.Powertools.Kafka.Avro.csproj" />
</ItemGroup>
<Target Name="GenerateAvroClasses" BeforeTargets="CoreCompile">
<Exec Command="avrogen -s $(ProjectDir)CustomerProfile.avsc $(ProjectDir)Generated"/>
Expand Down
6 changes: 4 additions & 2 deletions examples/Kafka/Json/src/Json.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
<PackageReference Include="AWS.Lambda.Powertools.Kafka.Json" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Kafka.Json\AWS.Lambda.Powertools.Kafka.Json.csproj" />
</ItemGroup>
<ItemGroup>
<None Remove="kafka-json-event.json" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
<PackageReference Include="AWS.Lambda.Powertools.Kafka.Protobuf" Version="3.0.2" />
<PackageReference Include="Grpc.Tools" Version="2.72.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Kafka.Protobuf\AWS.Lambda.Powertools.Kafka.Protobuf.csproj" />
</ItemGroup>
<ItemGroup>
<Content Update="kafka-protobuf-event.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
6 changes: 4 additions & 2 deletions examples/Kafka/Protobuf/src/Protobuf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
<PackageReference Include="AWS.Lambda.Powertools.Kafka.Protobuf" Version="3.0.2" />
<PackageReference Include="Grpc.Tools" Version="2.72.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Kafka.Protobuf\AWS.Lambda.Powertools.Kafka.Protobuf.csproj" />
</ItemGroup>
<ItemGroup>
<Content Update="kafka-protobuf-event.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
4 changes: 3 additions & 1 deletion examples/Logging/src/HelloWorld/HelloWorld.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.10.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
</ItemGroup>
</Project>
6 changes: 4 additions & 2 deletions examples/Metrics/src/HelloWorld/HelloWorld.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
<PackageReference Include="AWS.Lambda.Powertools.Metrics" Version="3.0.2" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.10.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Metrics\AWS.Lambda.Powertools.Metrics.csproj" />
</ItemGroup>
</Project>
4 changes: 3 additions & 1 deletion examples/Parameters/src/HelloWorld/HelloWorld.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
<PackageReference Include="AWS.Lambda.Powertools.Parameters" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Parameters\AWS.Lambda.Powertools.Parameters.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="9.2.0" />
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
<PackageReference Include="AWS.Lambda.Powertools.Metrics" Version="3.0.2" />
<PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Metrics\AWS.Lambda.Powertools.Metrics.csproj" />
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Tracing\AWS.Lambda.Powertools.Tracing.csproj" />
</ItemGroup>
</Project>
6 changes: 4 additions & 2 deletions examples/Tracing/src/HelloWorld/HelloWorld.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
<PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="3.0.2" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.10.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
<ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Tracing\AWS.Lambda.Powertools.Tracing.csproj" />
</ItemGroup>
</Project>
Loading