Merge branch 'master' into dev

aws · Oct 22, 2024 · 01f179a · 01f179a
2 parents 46b3d46 + 56e2b39
commit 01f179a
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj b/Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj
@@ -35,7 +35,7 @@
  </ItemGroup>
 
  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
- <PackageReference Include="System.Text.Json" Version="6.0.0" />
+ <PackageReference Include="System.Text.Json" Version="6.0.10" />
  </ItemGroup> 
 
  <ItemGroup>

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
@@ -9,7 +9,7 @@
  <AssemblyName>Amazon.Lambda.Serialization.Json</AssemblyName>
  <PackageId>Amazon.Lambda.Serialization.Json</PackageId>
  <PackageTags>AWS;Amazon;Lambda</PackageTags>
- <VersionPrefix>2.2.3</VersionPrefix>
+ <VersionPrefix>2.2.4</VersionPrefix>
  </PropertyGroup>
 
  <ItemGroup>

diff --git 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>(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
@@ -48,7 +48,7 @@ public void Serialize<T>(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/...zon.Lambda.Serialization.SystemTextJson/Amazon.Lambda.Serialization.SystemTextJson.csproj b/...zon.Lambda.Serialization.SystemTextJson/Amazon.Lambda.Serialization.SystemTextJson.csproj
@@ -9,7 +9,7 @@
  <AssemblyName>Amazon.Lambda.Serialization.SystemTextJson</AssemblyName>
  <PackageId>Amazon.Lambda.Serialization.SystemTextJson</PackageId>
  <PackageTags>AWS;Amazon;Lambda</PackageTags>
- <VersionPrefix>2.4.3</VersionPrefix>
+ <VersionPrefix>2.4.4</VersionPrefix>
  <PackageReadmeFile>README.md</PackageReadmeFile>
  </PropertyGroup>
  <ItemGroup>

diff --git 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>(T response, Stream responseStream)
  {
  try
  {
- if (_debug)
+ if (_debug && response != null)
  {
  using (var debugWriter = new StringWriter())
  using (var utf8Writer = new Utf8JsonWriter(responseStream, WriterOptions))

diff --git a/...nnotations.SourceGenerators.Tests/Amazon.Lambda.Annotations.SourceGenerators.Tests.csproj b/...nnotations.SourceGenerators.Tests/Amazon.Lambda.Annotations.SourceGenerators.Tests.csproj
@@ -16,7 +16,7 @@
  <PackageReference Include="Moq" Version="4.18.4" />
  <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
  <PackageReference Include="System.Memory" Version="4.5.5" />
- <PackageReference Include="System.Text.Json" Version="8.0.4" />
+ <PackageReference Include="System.Text.Json" Version="8.0.5" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Libraries/test/TestServerlessApp/TestServerlessApp.csproj b/Libraries/test/TestServerlessApp/TestServerlessApp.csproj
@@ -19,7 +19,7 @@
  </ItemGroup>
  <ItemGroup>
  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
- <PackageReference Include="System.Text.Json" Version="8.0.4" />
+ <PackageReference Include="System.Text.Json" Version="8.0.5" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\..\src\Amazon.Lambda.Annotations.SourceGenerator\Amazon.Lambda.Annotations.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />

diff --git 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.