.Net: Update Amazon packages (#12607)

rogerbarreto · SergeyMenshykh · web-flow · commit 62913836eb08 · 2025-06-27T13:28:51.000Z
### Motivation and Context - Update all Amazon Related packages. - Extra bump on Analyzers - Agent + Connector Codebase IT passing. ![image](https://github.com/user-attachments/assets/2e18278e-a206-4698-9f31-10cafc9bad17) --------- Co-authored-by: SergeyMenshykh <68852919+SergeyMenshykh@users.noreply.github.com>
diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
@@ -10,13 +10,13 @@
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.3.1" />
     <PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="9.3.1" />
     <PackageVersion Include="Aspire.Hosting.Azure.Search" Version="9.3.1" />
-    <PackageVersion Include="AWSSDK.BedrockAgent" Version="4.0.0-preview.13" />
-    <PackageVersion Include="AWSSDK.BedrockAgentRuntime" Version="4.0.0-preview.13" />
-    <PackageVersion Include="AWSSDK.BedrockRuntime" Version="4.0.0.2" />
-    <PackageVersion Include="AWSSDK.Core" Version="4.0.0.3" />
-    <PackageVersion Include="AWSSDK.Extensions.Bedrock.MEAI" Version="4.0.0-preview.16" />
-    <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0" />
-    <PackageVersion Include="AWSSDK.SecurityToken" Version="4.0.0.2" />
+    <PackageVersion Include="AWSSDK.BedrockAgent" Version="4.0.3.7" />
+    <PackageVersion Include="AWSSDK.BedrockAgentRuntime" Version="4.0.4.6" />
+    <PackageVersion Include="AWSSDK.BedrockRuntime" Version="4.0.0.11" />
+    <PackageVersion Include="AWSSDK.Core" Version="4.0.0.13" />
+    <PackageVersion Include="AWSSDK.Extensions.Bedrock.MEAI" Version="4.0.1.1" />
+    <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.2" />
+    <PackageVersion Include="AWSSDK.SecurityToken" Version="4.0.1.2" />
     <PackageVersion Include="Azure.AI.Agents.Persistent" Version="1.0.0" />
     <PackageVersion Include="Azure.AI.ContentSafety" Version="1.0.0" />
     <PackageVersion Include="Azure.AI.Inference" Version="1.0.0-beta.5" />
@@ -187,12 +187,12 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageVersion Include="xunit.analyzers" Version="1.17.0" />
+    <PackageVersion Include="xunit.analyzers" Version="1.22.0" />
     <PackageReference Include="xunit.analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAIChatCompletionServiceTests.cs b/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAIChatCompletionServiceTests.cs
@@ -1362,12 +1362,12 @@ public async Task FunctionResultsCanBeProvidedToLLMAsManyResultsInOneChatMessage
     public async Task GetChatMessageContentShouldSendMutatedChatHistoryToLLM()
     {
         // Arrange
-        static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
+        static Task MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
         {
             // Remove the function call messages from the chat history to reduce token count.
             context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
 
-            next(context);
+            return next(context);
         }
 
         var kernel = new Kernel();
@@ -1433,12 +1433,12 @@ static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFu
     public async Task GetStreamingChatMessageContentsShouldSendMutatedChatHistoryToLLM()
     {
         // Arrange
-        static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
+        static Task MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
         {
             // Remove the function call messages from the chat history to reduce token count.
             context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
 
-            next(context);
+            return next(context);
         }
 
         var kernel = new Kernel();
diff --git a/dotnet/src/Connectors/Connectors.MistralAI.UnitTests/Services/MistralAIChatCompletionServiceTests.cs b/dotnet/src/Connectors/Connectors.MistralAI.UnitTests/Services/MistralAIChatCompletionServiceTests.cs
@@ -77,17 +77,17 @@ public async Task ValidateGetStreamingChatMessageContentsAsync()
     public async Task GetChatMessageContentShouldSendMutatedChatHistoryToLLMAsync()
     {
         // Arrange
-        static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
+        static Task MutateChatHistoryAsync(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
         {
             // Remove the function call messages from the chat history to reduce token count.
             context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
 
-            next(context);
+            return next(context);
         }
 
         var kernel = new Kernel();
         kernel.ImportPluginFromFunctions("WeatherPlugin", [KernelFunctionFactory.CreateFromMethod((string location) => "rainy", "GetWeather")]);
-        kernel.AutoFunctionInvocationFilters.Add(new AutoFunctionInvocationFilter(MutateChatHistory));
+        kernel.AutoFunctionInvocationFilters.Add(new AutoFunctionInvocationFilter(MutateChatHistoryAsync));
 
         var firstResponse = this.GetTestResponseAsBytes("chat_completions_function_call_response.json");
         var secondResponse = this.GetTestResponseAsBytes("chat_completions_function_called_response.json");
@@ -149,12 +149,12 @@ static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFu
     public async Task GetStreamingChatMessageContentsShouldSendMutatedChatHistoryToLLMAsync()
     {
         // Arrange
-        static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
+        static Task MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
         {
             // Remove the function call messages from the chat history to reduce token count.
             context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
 
-            next(context);
+            return next(context);
         }
 
         var kernel = new Kernel();
diff --git a/dotnet/src/Connectors/Connectors.Ollama.UnitTests/Services/OllamaChatCompletionTests.cs b/dotnet/src/Connectors/Connectors.Ollama.UnitTests/Services/OllamaChatCompletionTests.cs
@@ -700,12 +700,12 @@ public async Task GetChatMessageContentsWithFunctionCallMaximumAutoInvokeAttempt
     public async Task GetChatMessageContentShouldSendMutatedChatHistoryToLLMAsync()
     {
         // Arrange
-        static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
+        static Task MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
         {
             // Remove the function call messages from the chat history to reduce token count.
             context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
 
-            next(context);
+            return next(context);
         }
 
         var kernel = new Kernel();
diff --git a/dotnet/src/Connectors/Connectors.OpenAI.UnitTests/Services/OpenAIChatCompletionServiceTests.cs b/dotnet/src/Connectors/Connectors.OpenAI.UnitTests/Services/OpenAIChatCompletionServiceTests.cs
@@ -1107,12 +1107,12 @@ public async Task GetInvalidResponseThrowsExceptionAndIsCapturedByDiagnosticsAsy
     public async Task GetChatMessageContentShouldSendMutatedChatHistoryToLLM()
     {
         // Arrange
-        static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
+        static Task MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
         {
             // Remove the function call messages from the chat history to reduce token count.
             context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
 
-            next(context);
+            return next(context);
         }
 
         var kernel = new Kernel();
@@ -1178,12 +1178,12 @@ static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFu
     public async Task GetStreamingChatMessageContentsShouldSendMutatedChatHistoryToLLM()
     {
         // Arrange
-        static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
+        static Task MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)
         {
             // Remove the function call messages from the chat history to reduce token count.
             context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
 
-            next(context);
+            return next(context);
         }
 
         var kernel = new Kernel();
diff --git a/dotnet/src/IntegrationTests/Connectors/Amazon/Bedrock/BedrockTextGenerationTests.cs b/dotnet/src/IntegrationTests/Connectors/Amazon/Bedrock/BedrockTextGenerationTests.cs
@@ -15,8 +15,6 @@ public class BedrockTextGenerationTests
     [InlineData("cohere.command-r-v1:0")]
     [InlineData("cohere.command-r-plus-v1:0")]
     [InlineData("ai21.jamba-instruct-v1:0")]
-    [InlineData("ai21.j2-ultra-v1")]
-    [InlineData("ai21.j2-mid-v1")]
     [InlineData("meta.llama3-70b-instruct-v1:0")]
     [InlineData("meta.llama3-8b-instruct-v1:0")]
     [InlineData("mistral.mistral-7b-instruct-v0:2")]

Original file line number	Diff line number	Diff line change
`@@ -1362,12 +1362,12 @@ public async Task FunctionResultsCanBeProvidedToLLMAsManyResultsInOneChatMessage`
`1362`	`1362`	`public async Task GetChatMessageContentShouldSendMutatedChatHistoryToLLM()`
`1363`	`1363`	`{`
`1364`	`1364`	`// Arrange`
`1365`		`- static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
	`1365`	`+ static Task MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
`1366`	`1366`	`{`
`1367`	`1367`	`// Remove the function call messages from the chat history to reduce token count.`
`1368`	`1368`	context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
`1369`	`1369`
`1370`		`- next(context);`
	`1370`	`+ return next(context);`
`1371`	`1371`	`}`
`1372`	`1372`
`1373`	`1373`	`var kernel = new Kernel();`
`@@ -1433,12 +1433,12 @@ static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFu`
`1433`	`1433`	`public async Task GetStreamingChatMessageContentsShouldSendMutatedChatHistoryToLLM()`
`1434`	`1434`	`{`
`1435`	`1435`	`// Arrange`
`1436`		`- static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
	`1436`	`+ static Task MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
`1437`	`1437`	`{`
`1438`	`1438`	`// Remove the function call messages from the chat history to reduce token count.`
`1439`	`1439`	context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
`1440`	`1440`
`1441`		`- next(context);`
	`1441`	`+ return next(context);`
`1442`	`1442`	`}`
`1443`	`1443`
`1444`	`1444`	`var kernel = new Kernel();`
Original file line number	Diff line number	Diff line change
`@@ -77,17 +77,17 @@ public async Task ValidateGetStreamingChatMessageContentsAsync()`
`77`	`77`	`public async Task GetChatMessageContentShouldSendMutatedChatHistoryToLLMAsync()`
`78`	`78`	`{`
`79`	`79`	`// Arrange`
`80`		`- static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
	`80`	`+ static Task MutateChatHistoryAsync(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
`81`	`81`	`{`
`82`	`82`	`// Remove the function call messages from the chat history to reduce token count.`
`83`	`83`	context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
`84`	`84`
`85`		`- next(context);`
	`85`	`+ return next(context);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`var kernel = new Kernel();`
`89`	`89`	`kernel.ImportPluginFromFunctions("WeatherPlugin", [KernelFunctionFactory.CreateFromMethod((string location) => "rainy", "GetWeather")]);`
`90`		`- kernel.AutoFunctionInvocationFilters.Add(new AutoFunctionInvocationFilter(MutateChatHistory));`
	`90`	`+ kernel.AutoFunctionInvocationFilters.Add(new AutoFunctionInvocationFilter(MutateChatHistoryAsync));`
`91`	`91`
`92`	`92`	`var firstResponse = this.GetTestResponseAsBytes("chat_completions_function_call_response.json");`
`93`	`93`	`var secondResponse = this.GetTestResponseAsBytes("chat_completions_function_called_response.json");`
`@@ -149,12 +149,12 @@ static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFu`
`149`	`149`	`public async Task GetStreamingChatMessageContentsShouldSendMutatedChatHistoryToLLMAsync()`
`150`	`150`	`{`
`151`	`151`	`// Arrange`
`152`		`- static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
	`152`	`+ static Task MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
`153`	`153`	`{`
`154`	`154`	`// Remove the function call messages from the chat history to reduce token count.`
`155`	`155`	context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
`156`	`156`
`157`		`- next(context);`
	`157`	`+ return next(context);`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`var kernel = new Kernel();`
Original file line number	Diff line number	Diff line change
`@@ -700,12 +700,12 @@ public async Task GetChatMessageContentsWithFunctionCallMaximumAutoInvokeAttempt`
`700`	`700`	`public async Task GetChatMessageContentShouldSendMutatedChatHistoryToLLMAsync()`
`701`	`701`	`{`
`702`	`702`	`// Arrange`
`703`		`- static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
	`703`	`+ static Task MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
`704`	`704`	`{`
`705`	`705`	`// Remove the function call messages from the chat history to reduce token count.`
`706`	`706`	context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
`707`	`707`
`708`		`- next(context);`
	`708`	`+ return next(context);`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`var kernel = new Kernel();`
Original file line number	Diff line number	Diff line change
`@@ -1107,12 +1107,12 @@ public async Task GetInvalidResponseThrowsExceptionAndIsCapturedByDiagnosticsAsy`
`1107`	`1107`	`public async Task GetChatMessageContentShouldSendMutatedChatHistoryToLLM()`
`1108`	`1108`	`{`
`1109`	`1109`	`// Arrange`
`1110`		`- static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
	`1110`	`+ static Task MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
`1111`	`1111`	`{`
`1112`	`1112`	`// Remove the function call messages from the chat history to reduce token count.`
`1113`	`1113`	context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
`1114`	`1114`
`1115`		`- next(context);`
	`1115`	`+ return next(context);`
`1116`	`1116`	`}`
`1117`	`1117`
`1118`	`1118`	`var kernel = new Kernel();`
`@@ -1178,12 +1178,12 @@ static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFu`
`1178`	`1178`	`public async Task GetStreamingChatMessageContentsShouldSendMutatedChatHistoryToLLM()`
`1179`	`1179`	`{`
`1180`	`1180`	`// Arrange`
`1181`		`- static void MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
	`1181`	`+ static Task MutateChatHistory(AutoFunctionInvocationContext context, Func<AutoFunctionInvocationContext, Task> next)`
`1182`	`1182`	`{`
`1183`	`1183`	`// Remove the function call messages from the chat history to reduce token count.`
`1184`	`1184`	context.ChatHistory.RemoveRange(1, 2); // Remove the `Date` function call and function result messages.
`1185`	`1185`
`1186`		`- next(context);`
	`1186`	`+ return next(context);`
`1187`	`1187`	`}`
`1188`	`1188`
`1189`	`1189`	`var kernel = new Kernel();`