Skip to content

Commit e10c29b

Browse files
.Net: Bump AWSSDK to 4.0.0-preview.13 in /dotnet (microsoft#11484)
### Motivation and Context Code fixes for microsoft#11424 ### Description <!-- Describe your changes, the overall approach, the underlying design. These notes will help understanding how your code works. Thanks! --> ### Contribution Checklist <!-- Before submitting this PR, please make sure: --> - [ ] The code builds clean without any errors or warnings - [ ] The PR follows the [SK Contribution Guidelines](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md) and the [pre-submission formatting script](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md#development-scripts) raises no violations - [ ] All unit tests pass, and I have added new tests where possible - [ ] I didn't break anyone 😄
1 parent 9fc1a6d commit e10c29b

File tree

6 files changed

+13
-5
lines changed

6 files changed

+13
-5
lines changed

dotnet/Directory.Packages.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<ItemGroup>
88
<PackageVersion Include="Aspire.Azure.Search.Documents" Version="9.1.0" />
99
<PackageVersion Include="Aspire.Hosting.Azure.Search" Version="9.1.0" />
10-
<PackageVersion Include="AWSSDK.BedrockAgent" Version="4.0.0-preview.10" />
11-
<PackageVersion Include="AWSSDK.BedrockAgentRuntime" Version="4.0.0-preview.10" />
12-
<PackageVersion Include="AWSSDK.BedrockRuntime" Version="4.0.0-preview.11" />
13-
<PackageVersion Include="AWSSDK.Core" Version="4.0.0-preview.11" />
10+
<PackageVersion Include="AWSSDK.BedrockAgent" Version="4.0.0-preview.13" />
11+
<PackageVersion Include="AWSSDK.BedrockAgentRuntime" Version="4.0.0-preview.13" />
12+
<PackageVersion Include="AWSSDK.BedrockRuntime" Version="4.0.0-preview.13" />
13+
<PackageVersion Include="AWSSDK.Core" Version="4.0.0-preview.13" />
1414
<PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="9.1.0-preview.1.25121.10" />
1515
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.1.0" />
1616
<PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="9.1.0" />

dotnet/src/Agents/Bedrock/Extensions/BedrockAgentInvokeExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Threading.Tasks;
99
using Amazon.BedrockAgentRuntime;
1010
using Amazon.BedrockAgentRuntime.Model;
11-
using Amazon.Runtime.EventStreams.Internal;
11+
using Amazon.Runtime.EventStreams;
1212
using Microsoft.SemanticKernel.Agents.Extensions;
1313
using Microsoft.SemanticKernel.ChatCompletion;
1414
using Microsoft.SemanticKernel.Connectors.FunctionCalling;

dotnet/src/Agents/UnitTests/Bedrock/BedrockAgentChannelTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ private List<ChatMessageContent> CreateIncorrectSequenceHistory()
273273
"fakeSecretKey",
274274
mockRuntimeClientConfig.Object);
275275
#pragma warning restore Moq1410 // Moq: Set MockBehavior to Strict
276+
#pragma warning disable CA2000 // Dispose objects before losing scope
276277
mockRuntimeClient.Setup(x => x.InvokeAgentAsync(
277278
It.IsAny<InvokeAgentRequest>(),
278279
It.IsAny<CancellationToken>())
@@ -283,6 +284,7 @@ private List<ChatMessageContent> CreateIncorrectSequenceHistory()
283284
// Tests should expect an exception to be thrown.
284285
HttpStatusCode = System.Net.HttpStatusCode.NotFound,
285286
});
287+
#pragma warning restore CA2000 // Dispose objects before losing scope
286288

287289
return (mockClient, mockRuntimeClient);
288290
}

dotnet/src/Agents/UnitTests/Bedrock/BedrockAgentTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,12 @@ await Assert.ThrowsAsync<KernelException>(async () =>
293293
}
294294
});
295295

296+
#pragma warning disable CA2000 // Dispose objects before losing scope
296297
mockRuntimeClient.Setup(x => x.InvokeAgentAsync(
297298
It.IsAny<InvokeAgentRequest>(),
298299
It.IsAny<CancellationToken>()))
299300
.ReturnsAsync(new InvokeAgentResponse() { HttpStatusCode = System.Net.HttpStatusCode.OK });
301+
#pragma warning restore CA2000 // Dispose objects before losing scope
300302

301303
return (mockClient, mockRuntimeClient);
302304
}

dotnet/src/Connectors/Connectors.Amazon.UnitTests/Services/BedrockChatCompletionServiceTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,13 @@ public async Task GetStreamingChatMessageContentsAsyncShouldReturnStreamedChatMe
143143
{
144144
URL = "https://bedrock-runtime.us-east-1.amazonaws.com"
145145
});
146+
#pragma warning disable CA2000 // Dispose objects before losing scope
146147
mockBedrockApi.Setup(m => m.ConverseStreamAsync(It.IsAny<ConverseStreamRequest>(), It.IsAny<CancellationToken>()))
147148
.ReturnsAsync(new ConverseStreamResponse
148149
{
149150
Stream = new ConverseStreamOutput(new MemoryStream(content))
150151
});
152+
#pragma warning restore CA2000 // Dispose objects before losing scope
151153

152154
var kernel = Kernel.CreateBuilder().AddBedrockChatCompletionService(modelId, mockBedrockApi.Object).Build();
153155
var service = kernel.GetRequiredService<IChatCompletionService>();

dotnet/src/Connectors/Connectors.Amazon.UnitTests/Services/BedrockTextGenerationServiceTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,14 @@ public async Task GetStreamingTextContentsAsyncShouldReturnStreamedTextContentsA
191191
{
192192
URL = "https://bedrock-runtime.us-east-1.amazonaws.com"
193193
});
194+
#pragma warning disable CA2000 // Dispose objects before losing scope
194195
mockBedrockApi.Setup(m => m.InvokeModelWithResponseStreamAsync(It.IsAny<InvokeModelWithResponseStreamRequest>(), It.IsAny<CancellationToken>()))
195196
.ReturnsAsync(new InvokeModelWithResponseStreamResponse()
196197
{
197198
Body = new ResponseStream(new MemoryStream(content)),
198199
ContentType = "application/json"
199200
});
201+
#pragma warning restore CA2000 // Dispose objects before losing scope
200202
var kernel = Kernel.CreateBuilder().AddBedrockTextGenerationService(modelId, mockBedrockApi.Object).Build();
201203
var service = kernel.GetRequiredService<ITextGenerationService>();
202204

0 commit comments

Comments
 (0)