chore: update .NET SDK to v4.0.0

philasmar · philasmar · commit cf4ff7b7ca3b · 2025-04-28T16:16:24.000-04:00
diff --git a/.autover/changes/f47cf6f6-17f3-44b2-81a1-cf5bd4e228bc.json b/.autover/changes/f47cf6f6-17f3-44b2-81a1-cf5bd4e228bc.json
@@ -0,0 +1,11 @@
+{
+  "Projects": [
+    {
+      "Name": "AWS.Messaging",
+      "Type": "Minor",
+      "ChangelogMessages": [
+        "Updated the .NET SDK dependencies to the latest version GA 4.0.0"
+      ]
+    }
+  ]
+}
diff --git a/sampleapps/PollyIntegration/Program.cs b/sampleapps/PollyIntegration/Program.cs
@@ -41,6 +41,8 @@ await Host.CreateDefaultBuilder(args)
                 // builder.LoadConfigurationFromSettings(context.Configuration);
 
                 var mpfQueueUrl = context.Configuration["AWS:Resources:MPFQueueUrl"];
+                if (string.IsNullOrEmpty(mpfQueueUrl))
+                    throw new InvalidOperationException("Missing required configuration parameter 'AWS:Resources:MPFQueueUrl'.");
 
                 builder.AddSQSPoller(mpfQueueUrl);
                 builder.AddMessageHandler<ChatMessageHandler, ChatMessage>("chatMessage");
diff --git a/sampleapps/SubscriberService/Program.cs b/sampleapps/SubscriberService/Program.cs
@@ -31,6 +31,8 @@ await Host.CreateDefaultBuilder(args)
             // builder.LoadConfigurationFromSettings(context.Configuration);
 
             var mpfQueueUrl = context.Configuration["AWS:Resources:MPFQueueUrl"];
+            if (string.IsNullOrEmpty(mpfQueueUrl))
+                throw new InvalidOperationException("Missing required configuration parameter 'AWS:Resources:MPFQueueUrl'.");
 
             builder.AddSQSPoller(mpfQueueUrl);
             builder.AddMessageHandler<ChatMessageHandler, ChatMessage>("chatMessage");
diff --git a/src/AWS.Messaging/AWS.Messaging.csproj b/src/AWS.Messaging/AWS.Messaging.csproj
@@ -27,10 +27,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.EventBridge" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.SQS" Version="4.0.0-preview.11" />
+    <PackageReference Include="AWSSDK.EventBridge" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.SQS" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.*" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.*" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.*" />
diff --git a/test/AWS.Messaging.IntegrationTests/AWS.Messaging.IntegrationTests.csproj b/test/AWS.Messaging.IntegrationTests/AWS.Messaging.IntegrationTests.csproj
@@ -9,16 +9,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.CloudWatchLogs" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.IdentityManagement" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.Lambda" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.11" />
+    <PackageReference Include="AWSSDK.CloudWatchLogs" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.IdentityManagement" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.Lambda" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.*" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.*" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />
-    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.SQS" Version="4.0.0-preview.11" />
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.SQS" Version="4.0.0" />
     <PackageReference Include="xunit" Version="2.6.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/test/AWS.Messaging.Tests.Common/AWS.Messaging.Tests.Common.csproj b/test/AWS.Messaging.Tests.Common/AWS.Messaging.Tests.Common.csproj
@@ -9,12 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.CloudWatchLogs" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.IdentityManagement" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.Lambda" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.11" />
-    <PackageReference Include="AWSSDK.SQS" Version="4.0.0-preview.11" />
+    <PackageReference Include="AWSSDK.CloudWatchLogs" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.IdentityManagement" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.Lambda" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.SQS" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.*" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.*" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />
diff --git a/test/AWS.Messaging.Tests.Common/Services/InMemoryLogger.cs b/test/AWS.Messaging.Tests.Common/Services/InMemoryLogger.cs
@@ -33,7 +33,7 @@ public InMemoryLogger(LoggerExternalScopeProvider scopeProvider)
 
         public IEnumerable<LogItem> Logs => concurrentLogs.ToList();
 
-        public IDisposable BeginScope<TState>(TState state) => _scopeProvider.Push(state);
+        public IDisposable BeginScope<TState>(TState state)  where TState : notnull => _scopeProvider.Push(state);
 
         public bool IsEnabled(LogLevel logLevel) => logLevel != LogLevel.None;
 
@@ -52,4 +52,4 @@ public static ILoggingBuilder AddInMemoryLogger(this ILoggingBuilder builder)
             return builder.AddProvider(new InMemoryLoggerProvider(logger));
         }
     }
-}
+}
diff --git a/test/AWS.Messaging.UnitTests/DefaultMessageManagerTests.cs b/test/AWS.Messaging.UnitTests/DefaultMessageManagerTests.cs
@@ -426,9 +426,11 @@ public async Task ProcessMessageGroupAsync_WhenMessageFails_RemovesSkippedMessag
             // Access _inFlightMessageMetadata through reflection
             var inFlightMessageMetadataField = typeof(DefaultMessageManager)
                 .GetField("_inFlightMessageMetadata", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+            Assert.NotNull(inFlightMessageMetadataField);
             var inFlightMessageMetadata = inFlightMessageMetadataField.GetValue(manager) as ConcurrentDictionary<MessageEnvelope, InFlightMetadata>;
 
             // Assert
+            Assert.NotNull(inFlightMessageMetadata);
             Assert.False(inFlightMessageMetadata.ContainsKey(message2),
                 "Skipped message should not remain in _inFlightMessageMetadata after group failure");
 
diff --git a/test/AWS.Messaging.UnitTests/SerializationTests/EnvelopeSerializerTests.cs b/test/AWS.Messaging.UnitTests/SerializationTests/EnvelopeSerializerTests.cs
@@ -733,6 +733,7 @@ public async Task ConvertToEnvelope_NullSubscriberMapping_ThrowsException()
         // Verify the inner exception type and message
         Assert.IsType<InvalidDataException>(exception.InnerException);
         var innerException = exception.InnerException as InvalidDataException;
+        Assert.NotNull(innerException);
         Assert.Contains("'unknownMessageType' is not a valid subscriber mapping.", innerException.Message);
         Assert.Contains("Available mappings:", innerException.Message);
         Assert.Contains("addressInfo", innerException.Message);
diff --git a/test/AWS.Messaging.UnitTests/SerializationTests/Handlers/MessageDataHandlerTests.cs b/test/AWS.Messaging.UnitTests/SerializationTests/Handlers/MessageDataHandlerTests.cs
@@ -32,6 +32,7 @@ public void CreateSQSMetadata_WithBasicMessage_ReturnsCorrectMetadata()
         // Assert
         Assert.Equal("test-message-id", metadata.MessageID);
         Assert.Equal("test-receipt-handle", metadata.ReceiptHandle);
+        Assert.NotNull(metadata.MessageAttributes);
         Assert.Single(metadata.MessageAttributes);
         Assert.Equal("TestValue", metadata.MessageAttributes["TestAttribute"].StringValue);
     }
@@ -140,6 +141,7 @@ public void CreateEventBridgeMetadata_WithValidJson_ReturnsCorrectMetadata()
         Assert.Equal("123456789012", metadata.AWSAccount);
         Assert.Equal(DateTimeOffset.Parse("2024-03-15T10:00:00Z"), metadata.Time);
         Assert.Equal("us-east-1", metadata.AWSRegion);
+        Assert.NotNull(metadata.Resources);
         Assert.Equal(2, metadata.Resources.Count);
         Assert.Contains("resource1", metadata.Resources);
         Assert.Contains("resource2", metadata.Resources);
diff --git a/test/AWS.Messaging.UnitTests/SerializationTests/Parsers/SQSMessageParserTests.cs b/test/AWS.Messaging.UnitTests/SerializationTests/Parsers/SQSMessageParserTests.cs
@@ -81,6 +81,7 @@ public void Parse_WithMessageAttributes_IncludesAttributesInMetadata()
         // Assert
         Assert.Equal(json, messageBody);
         Assert.NotNull(metadata.SQSMetadata);
+        Assert.NotNull(metadata.SQSMetadata.MessageAttributes);
         Assert.Single(metadata.SQSMetadata.MessageAttributes);
         Assert.Equal("TestValue", metadata.SQSMetadata.MessageAttributes["TestAttribute"].StringValue);
     }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public InMemoryLogger(LoggerExternalScopeProvider scopeProvider)`
`33`	`33`
`34`	`34`	`public IEnumerable<LogItem> Logs => concurrentLogs.ToList();`
`35`	`35`
`36`		`- public IDisposable BeginScope<TState>(TState state) => _scopeProvider.Push(state);`
	`36`	`+ public IDisposable BeginScope<TState>(TState state) where TState : notnull => _scopeProvider.Push(state);`
`37`	`37`
`38`	`38`	`public bool IsEnabled(LogLevel logLevel) => logLevel != LogLevel.None;`
`39`	`39`
`@@ -52,4 +52,4 @@ public static ILoggingBuilder AddInMemoryLogger(this ILoggingBuilder builder)`
`52`	`52`	`return builder.AddProvider(new InMemoryLoggerProvider(logger));`
`53`	`53`	`}`
`54`	`54`	`}`
`55`		`-}`
	`55`	`+}`