diff --git a/Directory.Packages.props b/Directory.Packages.props index 69843942fd..7c93da9985 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,14 +6,14 @@ <PropertyGroup> <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled> - <TestcontainersPackageVersion>4.0.0</TestcontainersPackageVersion> + <TestcontainersPackageVersion>4.3.0</TestcontainersPackageVersion> <AzureProvisiongVersion>1.0.0</AzureProvisiongVersion> <!-- The Npgsql version used when using Npgsql EF Core on net8. The major versions need to match between Npgsql and EF Core. --> <Npgsql8Version>8.0.6</Npgsql8Version> </PropertyGroup> <ItemGroup> <!-- Azure SDK for .NET dependencies --> - <PackageVersion Include="Azure.AI.OpenAI" Version="2.2.0-beta.1" /> + <PackageVersion Include="Azure.AI.OpenAI" Version="2.2.0-beta.2" /> <PackageVersion Include="Azure.Data.Tables" Version="12.10.0" /> <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" /> <PackageVersion Include="Azure.Messaging.EventHubs" Version="5.11.6" /> @@ -22,13 +22,13 @@ <PackageVersion Include="Azure.Search.Documents" Version="11.6.0" /> <PackageVersion Include="Azure.Messaging.WebPubSub" Version="1.4.0" /> <PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" /> - <PackageVersion Include="Azure.Storage.Blobs" Version="12.23.0" /> - <PackageVersion Include="Azure.Storage.Queues" Version="12.21.0" /> + <PackageVersion Include="Azure.Storage.Blobs" Version="12.24.0" /> + <PackageVersion Include="Azure.Storage.Queues" Version="12.22.0" /> <PackageVersion Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.1.1" /> <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.47.2" /> <PackageVersion Include="Microsoft.Azure.SignalR" Version="1.30.2" /> <PackageVersion Include="Microsoft.Azure.SignalR.Management" Version="1.30.2" /> - <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.10.0" /> + <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.11.0" /> <!-- Azure Management SDK for .NET dependencies --> <PackageVersion Include="Azure.Provisioning" Version="$(AzureProvisiongVersion)" /> <PackageVersion Include="Azure.Provisioning.AppConfiguration" Version="$(AzureProvisiongVersion)" /> @@ -47,9 +47,9 @@ <PackageVersion Include="Azure.Provisioning.Sql" Version="$(AzureProvisiongVersion)" /> <PackageVersion Include="Azure.Provisioning.Storage" Version="$(AzureProvisiongVersion)" /> <PackageVersion Include="Azure.Provisioning.WebPubSub" Version="$(AzureProvisiongVersion)" /> - <PackageVersion Include="Azure.ResourceManager.Authorization" Version="1.1.3" /> - <PackageVersion Include="Azure.ResourceManager.KeyVault" Version="1.3.0" /> - <PackageVersion Include="Azure.ResourceManager.Resources" Version="1.9.0" /> + <PackageVersion Include="Azure.ResourceManager.Authorization" Version="1.1.4" /> + <PackageVersion Include="Azure.ResourceManager.KeyVault" Version="1.3.1" /> + <PackageVersion Include="Azure.ResourceManager.Resources" Version="1.9.1" /> <!-- AspNetCore.HealthChecks dependencies (3rd party packages) --> <PackageVersion Include="AspNetCore.HealthChecks.ApplicationStatus" Version="9.0.0" /> <PackageVersion Include="AspNetCore.HealthChecks.Azure.Data.Tables" Version="9.0.0" /> @@ -70,41 +70,41 @@ <PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" /> <PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" /> <!-- NuGet dependencies --> - <PackageVersion Include="NuGet.ProjectModel" Version="6.12.1" /> + <PackageVersion Include="NuGet.ProjectModel" Version="6.13.2" /> <!-- external dependencies --> - <PackageVersion Include="Confluent.Kafka" Version="2.6.1" /> - <PackageVersion Include="Dapper" Version="2.1.44" /> + <PackageVersion Include="Confluent.Kafka" Version="2.8.0" /> + <PackageVersion Include="Dapper" Version="2.1.66" /> <PackageVersion Include="DnsClient" Version="1.8.0" /> - <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.17.1" /> - <PackageVersion Include="Google.Protobuf" Version="3.29.3" /> - <PackageVersion Include="Grpc.AspNetCore" Version="2.67.0" /> - <PackageVersion Include="Grpc.Net.ClientFactory" Version="2.67.0" /> - <PackageVersion Include="Grpc.Tools" Version="2.67.0" /> + <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.17.3" /> + <PackageVersion Include="Google.Protobuf" Version="3.30.1" /> + <PackageVersion Include="Grpc.AspNetCore" Version="2.70.0" /> + <PackageVersion Include="Grpc.Net.ClientFactory" Version="2.70.0" /> + <PackageVersion Include="Grpc.Tools" Version="2.71.0" /> <PackageVersion Include="Humanizer.Core" Version="2.14.1" /> <PackageVersion Include="KubernetesClient" Version="16.0.2" /> - <PackageVersion Include="JsonPatch.Net" Version="3.2.3" /> + <PackageVersion Include="JsonPatch.Net" Version="3.3.0" /> <PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.1" /> <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.6" /> <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.11.6" /> <PackageVersion Include="Milvus.Client" Version="2.3.0-preview.1" /> - <PackageVersion Include="MongoDB.Driver" Version="3.1.0" /> + <PackageVersion Include="MongoDB.Driver" Version="3.2.1" /> <PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="2.0.0" /> - <PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.3.6" /> + <PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.4.0" /> <PackageVersion Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" Version="2.1.0" /> - <PackageVersion Include="NATS.Net" Version="2.5.3" /> - <PackageVersion Include="Npgsql.DependencyInjection" Version="9.0.2" /> - <PackageVersion Include="OpenAI" Version="2.2.0-beta.1" /> - <PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.60" /> - <PackageVersion Include="Oracle.ManagedDataAccess.OpenTelemetry" Version="23.6.0" /> - <PackageVersion Include="Polly.Core" Version="8.5.1" /> - <PackageVersion Include="Polly.Extensions" Version="8.5.1" /> - <PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" /> - <PackageVersion Include="Qdrant.Client" Version="1.12.0" /> - <PackageVersion Include="RabbitMQ.Client" Version="7.0.0" /> + <PackageVersion Include="NATS.Net" Version="2.5.11" /> + <PackageVersion Include="Npgsql.DependencyInjection" Version="9.0.3" /> + <PackageVersion Include="OpenAI" Version="2.2.0-beta.2" /> + <PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.70" /> <!-- Can't update passed to 9.x versions as those lift up LTS versions when targeting net8 --> + <PackageVersion Include="Oracle.ManagedDataAccess.OpenTelemetry" Version="23.7.0" /> + <PackageVersion Include="Polly.Core" Version="8.5.2" /> + <PackageVersion Include="Polly.Extensions" Version="8.5.2" /> + <PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" /> + <PackageVersion Include="Qdrant.Client" Version="1.13.0" /> + <PackageVersion Include="RabbitMQ.Client" Version="7.1.2" /> <PackageVersion Include="Spectre.Console" Version="0.49.2-preview.0.76" /> - <PackageVersion Include="StackExchange.Redis" Version="2.8.22" /> - <PackageVersion Include="System.IO.Hashing" Version="9.0.1" /> - <PackageVersion Include="Yarp.ReverseProxy" Version="2.2.0" /> + <PackageVersion Include="StackExchange.Redis" Version="2.8.31" /> + <PackageVersion Include="System.IO.Hashing" Version="9.0.3" /> + <PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" /> <PackageVersion Include="StreamJsonRpc" Version="2.22.3-alpha" /> <!-- Open Telemetry --> <PackageVersion Include="Npgsql.OpenTelemetry" Version="9.0.2" /> @@ -117,15 +117,15 @@ <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" /> <!-- build dependencies --> <PackageVersion Include="MicroBuild.Plugins.SwixBuild.Dotnet" Version="1.1.87-gba258badda" /> - <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" /> + <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0" /> <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23564.4" /> <PackageVersion Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" /> <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23564.4" /> <PackageVersion Include="Microsoft.DotNet.GenAPI.Task" Version="9.0.103-servicing.25065.25" /> <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.25072.1" /> <!-- unit test dependencies --> - <PackageVersion Include="bUnit" Version="1.33.3" /> - <PackageVersion Include="JsonSchema.Net" Version="7.3.1" /> + <PackageVersion Include="bUnit" Version="1.36.0" /> <!-- Can't update passed to 1.37.x versions as those lift up LTS versions when targeting net8 --> + <PackageVersion Include="JsonSchema.Net" Version="7.3.3" /> <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" /> <PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" /> <PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" /> @@ -160,7 +160,7 @@ <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.CosmosDb" Version="4.12.0" /> <PackageVersion Include="Microsoft.Azure.Functions.Worker.OpenTelemetry" Version="1.1.0-preview6" /> <PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.1" /> - <PackageVersion Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" /> + <PackageVersion Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" /> <!-- Pinned versions for Component Governance - Remove when root dependencies are updated --> <PackageVersion Include="Azure.Core" Version="1.44.1" /> <PackageVersion Include="Azure.Identity" Version="1.13.2" /> diff --git a/src/Components/Aspire.RabbitMQ.Client.v7/Aspire.RabbitMQ.Client.v7.csproj b/src/Components/Aspire.RabbitMQ.Client.v7/Aspire.RabbitMQ.Client.v7.csproj index d68204e642..6a868d59b5 100644 --- a/src/Components/Aspire.RabbitMQ.Client.v7/Aspire.RabbitMQ.Client.v7.csproj +++ b/src/Components/Aspire.RabbitMQ.Client.v7/Aspire.RabbitMQ.Client.v7.csproj @@ -30,7 +30,7 @@ <PackageReference Include="Microsoft.Extensions.Configuration.Binder" /> <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" /> <PackageReference Include="Polly.Core" /> - <PackageReference Include="RabbitMQ.Client" VersionOverride="7.0.0" /> + <PackageReference Include="RabbitMQ.Client" VersionOverride="7.1.2" /> <PackageReference Include="OpenTelemetry.Extensions.Hosting" /> </ItemGroup> diff --git a/tests/Aspire.MongoDB.Driver.Tests/ConformanceTests.cs b/tests/Aspire.MongoDB.Driver.Tests/ConformanceTests.cs index be04430590..858243a7ed 100644 --- a/tests/Aspire.MongoDB.Driver.Tests/ConformanceTests.cs +++ b/tests/Aspire.MongoDB.Driver.Tests/ConformanceTests.cs @@ -60,9 +60,7 @@ protected override (string json, string error)[] InvalidJsonToErrorMessage => ne protected override void PopulateConfiguration(ConfigurationManager configuration, string? key = null) { - var connectionString = RequiresDockerAttribute.IsSupported ? - $"{_containerFixture.GetConnectionString()}test_db" : - "mongodb://root:password@localhost:27017/test_db?authSource=admin&authMechanism=SCRAM-SHA-256"; + var connectionString = GetConnectionString(); configuration.AddInMemoryCollection( [ @@ -72,6 +70,17 @@ protected override void PopulateConfiguration(ConfigurationManager configuration ]); } + private string GetConnectionString() + { + if (RequiresDockerAttribute.IsSupported) + { + var builder = new UriBuilder(_containerFixture.GetConnectionString()); + builder.Path = "test_db"; + return builder.ToString(); + } + return "mongodb://root:password@localhost:27017/test_db?authSource=admin&authMechanism=SCRAM-SHA-256"; + } + protected override void RegisterComponent(HostApplicationBuilder builder, Action<MongoDBSettings>? configure = null, string? key = null) { if (key is null)