From 3164e6b17b9530ccaa76c8669b4731e0218fd75b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:42:13 -0700 Subject: [PATCH 1/4] chore(deps): bump System.Text.Json (#1833) Bumps [System.Text.Json](https://github.com/dotnet/runtime) from 6.0.0 to 6.0.10. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v6.0.0...v6.0.10) --- updated-dependencies: - dependency-name: System.Text.Json dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../Amazon.Lambda.RuntimeSupport.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj b/Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj index 052425369..018b042fd 100644 --- a/Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj +++ b/Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj @@ -35,7 +35,7 @@ - + From c8634e0b43e16cd8dfbe7eef99efed0e10682434 Mon Sep 17 00:00:00 2001 From: Norm Johanson Date: Mon, 14 Oct 2024 18:08:19 -0700 Subject: [PATCH 2/4] Update version of System.Text.Json in test projects (#1837) --- .../Amazon.Lambda.Annotations.SourceGenerators.Tests.csproj | 2 +- Libraries/test/TestServerlessApp/TestServerlessApp.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/Amazon.Lambda.Annotations.SourceGenerators.Tests.csproj b/Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/Amazon.Lambda.Annotations.SourceGenerators.Tests.csproj index 8e8f5700a..42794db74 100644 --- a/Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/Amazon.Lambda.Annotations.SourceGenerators.Tests.csproj +++ b/Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/Amazon.Lambda.Annotations.SourceGenerators.Tests.csproj @@ -16,7 +16,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Libraries/test/TestServerlessApp/TestServerlessApp.csproj b/Libraries/test/TestServerlessApp/TestServerlessApp.csproj index 263e0b650..a790ac481 100644 --- a/Libraries/test/TestServerlessApp/TestServerlessApp.csproj +++ b/Libraries/test/TestServerlessApp/TestServerlessApp.csproj @@ -19,7 +19,7 @@ - + From a7b44f7fb65873d7264acde988f1426037fee198 Mon Sep 17 00:00:00 2001 From: Norm Johanson Date: Tue, 15 Oct 2024 11:09:44 -0700 Subject: [PATCH 3/4] Update RELEASE.CHANGELOG.md --- RELEASE.CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE.CHANGELOG.md b/RELEASE.CHANGELOG.md index 7045daf92..e72dde8b8 100644 --- a/RELEASE.CHANGELOG.md +++ b/RELEASE.CHANGELOG.md @@ -1,3 +1,7 @@ +### Release 2024-10-15 +* **AWSLambdaPSCore PowerShell Module (4.0.3.0)** + * Update default version of Microsoft.PowerShell.SDK to 7.4.5 + ### Release 2024-09-30 * **AWSLambdaPSCore PowerShell Module (4.0.2.0)** * Update PowerShell Lambda blueprints to reference the latest Amazon.Lambda.PowerShellHost and Amazon.Lambda.Core packages. From 56e2b39b56aed40e352b8b80afbb7e567a12d20a Mon Sep 17 00:00:00 2001 From: Norm Johanson Date: Tue, 22 Oct 2024 13:21:51 -0700 Subject: [PATCH 4/4] Add null checks before attempting debug response writing (#1840) --- .../Amazon.Lambda.Serialization.Json.csproj | 2 +- .../src/Amazon.Lambda.Serialization.Json/JsonSerializer.cs | 2 +- .../AbstractLambdaJsonSerializer.cs | 2 +- .../Amazon.Lambda.Serialization.SystemTextJson.csproj | 2 +- .../LambdaJsonSerializer.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Libraries/src/Amazon.Lambda.Serialization.Json/Amazon.Lambda.Serialization.Json.csproj b/Libraries/src/Amazon.Lambda.Serialization.Json/Amazon.Lambda.Serialization.Json.csproj index 1090ea808..803e971b0 100644 --- a/Libraries/src/Amazon.Lambda.Serialization.Json/Amazon.Lambda.Serialization.Json.csproj +++ b/Libraries/src/Amazon.Lambda.Serialization.Json/Amazon.Lambda.Serialization.Json.csproj @@ -9,7 +9,7 @@ Amazon.Lambda.Serialization.Json Amazon.Lambda.Serialization.Json AWS;Amazon;Lambda - 2.2.3 + 2.2.4 diff --git a/Libraries/src/Amazon.Lambda.Serialization.Json/JsonSerializer.cs b/Libraries/src/Amazon.Lambda.Serialization.Json/JsonSerializer.cs index 77c23e1e6..0555e2f9c 100644 --- a/Libraries/src/Amazon.Lambda.Serialization.Json/JsonSerializer.cs +++ b/Libraries/src/Amazon.Lambda.Serialization.Json/JsonSerializer.cs @@ -94,7 +94,7 @@ public void Serialize(T response, Stream responseStream) { try { - if (debug) + if (debug && response != null) { using (StringWriter debugWriter = new StringWriter()) { diff --git a/Libraries/src/Amazon.Lambda.Serialization.SystemTextJson/AbstractLambdaJsonSerializer.cs b/Libraries/src/Amazon.Lambda.Serialization.SystemTextJson/AbstractLambdaJsonSerializer.cs index 0f27cf3fa..2656c535b 100644 --- a/Libraries/src/Amazon.Lambda.Serialization.SystemTextJson/AbstractLambdaJsonSerializer.cs +++ b/Libraries/src/Amazon.Lambda.Serialization.SystemTextJson/AbstractLambdaJsonSerializer.cs @@ -48,7 +48,7 @@ public void Serialize(T response, Stream responseStream) { try { - if (_debug) + if (_debug && response != null) { using (var debugStream = new MemoryStream()) using (var utf8Writer = new Utf8JsonWriter(debugStream, WriterOptions)) diff --git a/Libraries/src/Amazon.Lambda.Serialization.SystemTextJson/Amazon.Lambda.Serialization.SystemTextJson.csproj b/Libraries/src/Amazon.Lambda.Serialization.SystemTextJson/Amazon.Lambda.Serialization.SystemTextJson.csproj index e6cb09dd6..84dfc7a7e 100644 --- a/Libraries/src/Amazon.Lambda.Serialization.SystemTextJson/Amazon.Lambda.Serialization.SystemTextJson.csproj +++ b/Libraries/src/Amazon.Lambda.Serialization.SystemTextJson/Amazon.Lambda.Serialization.SystemTextJson.csproj @@ -9,7 +9,7 @@ Amazon.Lambda.Serialization.SystemTextJson Amazon.Lambda.Serialization.SystemTextJson AWS;Amazon;Lambda - 2.4.3 + 2.4.4 README.md diff --git a/Libraries/src/Amazon.Lambda.Serialization.SystemTextJson/LambdaJsonSerializer.cs b/Libraries/src/Amazon.Lambda.Serialization.SystemTextJson/LambdaJsonSerializer.cs index bc162f227..dae777b54 100644 --- a/Libraries/src/Amazon.Lambda.Serialization.SystemTextJson/LambdaJsonSerializer.cs +++ b/Libraries/src/Amazon.Lambda.Serialization.SystemTextJson/LambdaJsonSerializer.cs @@ -95,7 +95,7 @@ public void Serialize(T response, Stream responseStream) { try { - if (_debug) + if (_debug && response != null) { using (var debugWriter = new StringWriter()) using (var utf8Writer = new Utf8JsonWriter(responseStream, WriterOptions))