From 2d710ee90de59f4e886badd2e084c8c47743f4de Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Mon, 17 Mar 2025 13:42:39 -0700 Subject: [PATCH 1/3] Updating NuGet package dependencies --- Directory.Packages.props | 68 +++++++++---------- .../Aspire.RabbitMQ.Client.v7.csproj | 2 +- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c2b67df6a7f..d1c269dfcbc 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,14 +6,14 @@ true true - 4.0.0 + 4.3.0 1.0.0 8.0.6 - + @@ -22,14 +22,14 @@ - - + + - + @@ -48,9 +48,9 @@ - - - + + + @@ -71,41 +71,41 @@ - + - - + + - - - - - + + + + + - + - + - + - - + + - - - - - - + + + + + + - - - + + + @@ -118,15 +118,15 @@ - + - - + + @@ -161,7 +161,7 @@ - + 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 d68204e6428..6a868d59b54 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 @@ - + From b2e5141dc6c8674b1f7e6e443e95441de98b0ba6 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Mon, 17 Mar 2025 16:53:50 -0700 Subject: [PATCH 2/3] Pin versions that lift up versions out of LTS --- Directory.Packages.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index d1c269dfcbc..4ac4d753979 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -94,14 +94,14 @@ - - + + - + @@ -125,7 +125,7 @@ - + From fa2516bdf19805c4bc1e9cd16d31e42cc8bb74b1 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 18 Mar 2025 08:52:19 -0500 Subject: [PATCH 3/3] Fix MongoDB tests for new test containers connection string --- .../ConformanceTests.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/Aspire.MongoDB.Driver.Tests/ConformanceTests.cs b/tests/Aspire.MongoDB.Driver.Tests/ConformanceTests.cs index be044305900..858243a7edc 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? configure = null, string? key = null) { if (key is null)