From 1f78b9052851394cff719a214e7ac55213619d1e Mon Sep 17 00:00:00 2001 From: Andre Hofmeister <9199345+HofmeisterAn@users.noreply.github.com> Date: Sun, 1 Dec 2024 10:40:31 +0100 Subject: [PATCH] feat: Remove `net6.0` and add `net9.0` TFM (#1311) --- Directory.Packages.props | 23 +++++++++---------- global.json | 2 +- .../Testcontainers.ModuleName.csproj | 2 +- .../Testcontainers.ActiveMq.csproj | 2 +- .../Testcontainers.ArangoDb.csproj | 2 +- .../Testcontainers.Azurite.csproj | 2 +- .../Testcontainers.BigQuery.csproj | 2 +- .../Testcontainers.Bigtable.csproj | 2 +- .../Testcontainers.ClickHouse.csproj | 2 +- .../Testcontainers.CockroachDb.csproj | 2 +- .../Testcontainers.Consul.csproj | 2 +- .../Testcontainers.CosmosDb.csproj | 2 +- .../Testcontainers.CouchDb.csproj | 2 +- .../CouchbaseBucket.cs | 1 + .../Testcontainers.Couchbase.csproj | 2 +- .../Testcontainers.DynamoDb.csproj | 2 +- .../Testcontainers.Elasticsearch.csproj | 2 +- .../Testcontainers.EventStoreDb.csproj | 2 +- .../Testcontainers.FakeGcsServer.csproj | 2 +- .../Testcontainers.FirebirdSql.csproj | 2 +- .../Testcontainers.Firestore.csproj | 2 +- .../Testcontainers.InfluxDb.csproj | 2 +- .../Testcontainers.JanusGraph.csproj | 2 +- .../Testcontainers.K3s.csproj | 2 +- .../Testcontainers.Kafka.csproj | 2 +- .../Testcontainers.Keycloak.csproj | 2 +- .../Testcontainers.Kusto.csproj | 2 +- .../Testcontainers.LocalStack.csproj | 2 +- .../Testcontainers.MariaDb.csproj | 2 +- .../Testcontainers.Milvus.csproj | 2 +- .../Testcontainers.Minio.csproj | 2 +- .../Testcontainers.MongoDb.csproj | 2 +- .../Testcontainers.MsSql.csproj | 2 +- .../Testcontainers.MySql.csproj | 2 +- .../Testcontainers.Nats.csproj | 2 +- .../Testcontainers.Neo4j.csproj | 2 +- .../Testcontainers.Oracle.csproj | 2 +- .../Testcontainers.Papercut.csproj | 2 +- .../Testcontainers.PostgreSql.csproj | 2 +- .../Testcontainers.PubSub.csproj | 2 +- .../Testcontainers.RabbitMq.csproj | 2 +- .../Testcontainers.RavenDb.csproj | 2 +- .../Testcontainers.Redis.csproj | 2 +- .../Testcontainers.Redpanda.csproj | 2 +- .../Testcontainers.WebDriver.csproj | 2 +- .../Testcontainers.Xunit.csproj | 2 +- .../Testcontainers.XunitV3.csproj | 2 +- .../MTlsEndpointAuthenticationProvider.cs | 9 +++++--- src/Testcontainers/Builders/TlsCredentials.cs | 3 +-- .../TlsEndpointAuthenticationProvider.cs | 4 ++++ .../Configurations/CustomConfiguration.cs | 4 ++-- src/Testcontainers/Testcontainers.csproj | 3 +-- .../Testcontainers.ActiveMq.Tests.csproj | 2 +- .../Testcontainers.ArangoDb.Tests.csproj | 2 +- .../Testcontainers.Azurite.Tests.csproj | 2 +- .../Testcontainers.BigQuery.Tests.csproj | 2 +- .../Testcontainers.Bigtable.Tests.csproj | 2 +- .../Testcontainers.ClickHouse.Tests.csproj | 2 +- .../Testcontainers.CockroachDb.Tests.csproj | 2 +- .../Testcontainers.Commons.csproj | 2 +- .../Testcontainers.Consul.Tests.csproj | 2 +- .../Testcontainers.CosmosDb.Tests.csproj | 2 +- .../Testcontainers.CouchDb.Tests.csproj | 2 +- .../Testcontainers.Couchbase.Tests.csproj | 2 +- .../Testcontainers.Databases.Tests.csproj | 2 +- .../Testcontainers.DynamoDb.Tests.csproj | 2 +- .../Testcontainers.Elasticsearch.Tests.csproj | 2 +- .../Testcontainers.EventStoreDb.Tests.csproj | 2 +- .../Testcontainers.FakeGcsServer.Tests.csproj | 2 +- .../Testcontainers.FirebirdSql.Tests.csproj | 2 +- .../Testcontainers.Firestore.Tests.csproj | 2 +- .../Testcontainers.InfluxDb.Tests.csproj | 2 +- .../Testcontainers.JanusGraph.Tests.csproj | 2 +- .../Testcontainers.K3s.Tests.csproj | 2 +- .../Testcontainers.Kafka.Tests.csproj | 2 +- .../Testcontainers.Keycloak.Tests.csproj | 2 +- .../Testcontainers.Kusto.Tests.csproj | 2 +- .../Testcontainers.LocalStack.Tests.csproj | 2 +- .../Testcontainers.MariaDb.Tests.csproj | 2 +- .../Testcontainers.Milvus.Tests.csproj | 2 +- .../Testcontainers.Minio.Tests.csproj | 2 +- .../Testcontainers.MongoDb.Tests.csproj | 2 +- .../Testcontainers.MsSql.Tests.csproj | 2 +- .../Testcontainers.MySql.Tests.csproj | 2 +- .../Testcontainers.Nats.Tests.csproj | 2 +- .../Testcontainers.Neo4j.Tests.csproj | 2 +- .../Testcontainers.Oracle.Tests.csproj | 2 +- .../Testcontainers.Papercut.Tests.csproj | 2 +- ...Testcontainers.Platform.Linux.Tests.csproj | 2 +- ...stcontainers.Platform.Windows.Tests.csproj | 2 +- .../Testcontainers.PostgreSql.Tests.csproj | 2 +- .../Testcontainers.PubSub.Tests.csproj | 2 +- .../Testcontainers.Pulsar.Tests.csproj | 2 +- .../Testcontainers.RabbitMq.Tests.csproj | 2 +- .../Testcontainers.RavenDb.Tests.csproj | 2 +- .../Testcontainers.Redis.Tests.csproj | 2 +- .../Testcontainers.Redpanda.Tests.csproj | 2 +- ...Testcontainers.ResourceReaper.Tests.csproj | 2 +- .../Testcontainers.Tests.csproj | 2 +- .../Configurations/CustomConfigurationTest.cs | 1 + .../Testcontainers.WebDriver.Tests.csproj | 2 +- .../Testcontainers.Xunit.Tests.csproj | 2 +- 102 files changed, 121 insertions(+), 115 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 813d398cf..e0c04516b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,14 +5,13 @@ - - + + - @@ -34,12 +33,12 @@ - + - + - + @@ -47,13 +46,13 @@ - + - + - - + + @@ -61,10 +60,10 @@ - + - \ No newline at end of file + diff --git a/global.json b/global.json index 39c53b83a..2bc13e80a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.200", + "version": "9.0.100", "rollForward": "latestMinor" } } diff --git a/src/Templates/CSharp/Testcontainers.ModuleName/Testcontainers.ModuleName.csproj b/src/Templates/CSharp/Testcontainers.ModuleName/Testcontainers.ModuleName.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Templates/CSharp/Testcontainers.ModuleName/Testcontainers.ModuleName.csproj +++ b/src/Templates/CSharp/Testcontainers.ModuleName/Testcontainers.ModuleName.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.ActiveMq/Testcontainers.ActiveMq.csproj b/src/Testcontainers.ActiveMq/Testcontainers.ActiveMq.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.ActiveMq/Testcontainers.ActiveMq.csproj +++ b/src/Testcontainers.ActiveMq/Testcontainers.ActiveMq.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.ArangoDb/Testcontainers.ArangoDb.csproj b/src/Testcontainers.ArangoDb/Testcontainers.ArangoDb.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.ArangoDb/Testcontainers.ArangoDb.csproj +++ b/src/Testcontainers.ArangoDb/Testcontainers.ArangoDb.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Azurite/Testcontainers.Azurite.csproj b/src/Testcontainers.Azurite/Testcontainers.Azurite.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Azurite/Testcontainers.Azurite.csproj +++ b/src/Testcontainers.Azurite/Testcontainers.Azurite.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.BigQuery/Testcontainers.BigQuery.csproj b/src/Testcontainers.BigQuery/Testcontainers.BigQuery.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.BigQuery/Testcontainers.BigQuery.csproj +++ b/src/Testcontainers.BigQuery/Testcontainers.BigQuery.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Bigtable/Testcontainers.Bigtable.csproj b/src/Testcontainers.Bigtable/Testcontainers.Bigtable.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Bigtable/Testcontainers.Bigtable.csproj +++ b/src/Testcontainers.Bigtable/Testcontainers.Bigtable.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.ClickHouse/Testcontainers.ClickHouse.csproj b/src/Testcontainers.ClickHouse/Testcontainers.ClickHouse.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.ClickHouse/Testcontainers.ClickHouse.csproj +++ b/src/Testcontainers.ClickHouse/Testcontainers.ClickHouse.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.CockroachDb/Testcontainers.CockroachDb.csproj b/src/Testcontainers.CockroachDb/Testcontainers.CockroachDb.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.CockroachDb/Testcontainers.CockroachDb.csproj +++ b/src/Testcontainers.CockroachDb/Testcontainers.CockroachDb.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Consul/Testcontainers.Consul.csproj b/src/Testcontainers.Consul/Testcontainers.Consul.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Consul/Testcontainers.Consul.csproj +++ b/src/Testcontainers.Consul/Testcontainers.Consul.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.CosmosDb/Testcontainers.CosmosDb.csproj b/src/Testcontainers.CosmosDb/Testcontainers.CosmosDb.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.CosmosDb/Testcontainers.CosmosDb.csproj +++ b/src/Testcontainers.CosmosDb/Testcontainers.CosmosDb.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.CouchDb/Testcontainers.CouchDb.csproj b/src/Testcontainers.CouchDb/Testcontainers.CouchDb.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.CouchDb/Testcontainers.CouchDb.csproj +++ b/src/Testcontainers.CouchDb/Testcontainers.CouchDb.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Couchbase/CouchbaseBucket.cs b/src/Testcontainers.Couchbase/CouchbaseBucket.cs index 4b2928071..04d8ab472 100644 --- a/src/Testcontainers.Couchbase/CouchbaseBucket.cs +++ b/src/Testcontainers.Couchbase/CouchbaseBucket.cs @@ -3,6 +3,7 @@ namespace Testcontainers.Couchbase; /// /// A Couchbase bucket. /// +[PublicAPI] public sealed class CouchbaseBucket { /// diff --git a/src/Testcontainers.Couchbase/Testcontainers.Couchbase.csproj b/src/Testcontainers.Couchbase/Testcontainers.Couchbase.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Couchbase/Testcontainers.Couchbase.csproj +++ b/src/Testcontainers.Couchbase/Testcontainers.Couchbase.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.DynamoDb/Testcontainers.DynamoDb.csproj b/src/Testcontainers.DynamoDb/Testcontainers.DynamoDb.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.DynamoDb/Testcontainers.DynamoDb.csproj +++ b/src/Testcontainers.DynamoDb/Testcontainers.DynamoDb.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Elasticsearch/Testcontainers.Elasticsearch.csproj b/src/Testcontainers.Elasticsearch/Testcontainers.Elasticsearch.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Elasticsearch/Testcontainers.Elasticsearch.csproj +++ b/src/Testcontainers.Elasticsearch/Testcontainers.Elasticsearch.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.EventStoreDb/Testcontainers.EventStoreDb.csproj b/src/Testcontainers.EventStoreDb/Testcontainers.EventStoreDb.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.EventStoreDb/Testcontainers.EventStoreDb.csproj +++ b/src/Testcontainers.EventStoreDb/Testcontainers.EventStoreDb.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.FakeGcsServer/Testcontainers.FakeGcsServer.csproj b/src/Testcontainers.FakeGcsServer/Testcontainers.FakeGcsServer.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.FakeGcsServer/Testcontainers.FakeGcsServer.csproj +++ b/src/Testcontainers.FakeGcsServer/Testcontainers.FakeGcsServer.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.FirebirdSql/Testcontainers.FirebirdSql.csproj b/src/Testcontainers.FirebirdSql/Testcontainers.FirebirdSql.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.FirebirdSql/Testcontainers.FirebirdSql.csproj +++ b/src/Testcontainers.FirebirdSql/Testcontainers.FirebirdSql.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Firestore/Testcontainers.Firestore.csproj b/src/Testcontainers.Firestore/Testcontainers.Firestore.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Firestore/Testcontainers.Firestore.csproj +++ b/src/Testcontainers.Firestore/Testcontainers.Firestore.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.InfluxDb/Testcontainers.InfluxDb.csproj b/src/Testcontainers.InfluxDb/Testcontainers.InfluxDb.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.InfluxDb/Testcontainers.InfluxDb.csproj +++ b/src/Testcontainers.InfluxDb/Testcontainers.InfluxDb.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.JanusGraph/Testcontainers.JanusGraph.csproj b/src/Testcontainers.JanusGraph/Testcontainers.JanusGraph.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.JanusGraph/Testcontainers.JanusGraph.csproj +++ b/src/Testcontainers.JanusGraph/Testcontainers.JanusGraph.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.K3s/Testcontainers.K3s.csproj b/src/Testcontainers.K3s/Testcontainers.K3s.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.K3s/Testcontainers.K3s.csproj +++ b/src/Testcontainers.K3s/Testcontainers.K3s.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Kafka/Testcontainers.Kafka.csproj b/src/Testcontainers.Kafka/Testcontainers.Kafka.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Kafka/Testcontainers.Kafka.csproj +++ b/src/Testcontainers.Kafka/Testcontainers.Kafka.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Keycloak/Testcontainers.Keycloak.csproj b/src/Testcontainers.Keycloak/Testcontainers.Keycloak.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Keycloak/Testcontainers.Keycloak.csproj +++ b/src/Testcontainers.Keycloak/Testcontainers.Keycloak.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Kusto/Testcontainers.Kusto.csproj b/src/Testcontainers.Kusto/Testcontainers.Kusto.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Kusto/Testcontainers.Kusto.csproj +++ b/src/Testcontainers.Kusto/Testcontainers.Kusto.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.LocalStack/Testcontainers.LocalStack.csproj b/src/Testcontainers.LocalStack/Testcontainers.LocalStack.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.LocalStack/Testcontainers.LocalStack.csproj +++ b/src/Testcontainers.LocalStack/Testcontainers.LocalStack.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.MariaDb/Testcontainers.MariaDb.csproj b/src/Testcontainers.MariaDb/Testcontainers.MariaDb.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.MariaDb/Testcontainers.MariaDb.csproj +++ b/src/Testcontainers.MariaDb/Testcontainers.MariaDb.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Milvus/Testcontainers.Milvus.csproj b/src/Testcontainers.Milvus/Testcontainers.Milvus.csproj index 51735310a..cbff16956 100644 --- a/src/Testcontainers.Milvus/Testcontainers.Milvus.csproj +++ b/src/Testcontainers.Milvus/Testcontainers.Milvus.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1;net462 + net8.0;net9.0;netstandard2.0;netstandard2.1;net462 latest diff --git a/src/Testcontainers.Minio/Testcontainers.Minio.csproj b/src/Testcontainers.Minio/Testcontainers.Minio.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Minio/Testcontainers.Minio.csproj +++ b/src/Testcontainers.Minio/Testcontainers.Minio.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.MongoDb/Testcontainers.MongoDb.csproj b/src/Testcontainers.MongoDb/Testcontainers.MongoDb.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.MongoDb/Testcontainers.MongoDb.csproj +++ b/src/Testcontainers.MongoDb/Testcontainers.MongoDb.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.MsSql/Testcontainers.MsSql.csproj b/src/Testcontainers.MsSql/Testcontainers.MsSql.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.MsSql/Testcontainers.MsSql.csproj +++ b/src/Testcontainers.MsSql/Testcontainers.MsSql.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.MySql/Testcontainers.MySql.csproj b/src/Testcontainers.MySql/Testcontainers.MySql.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.MySql/Testcontainers.MySql.csproj +++ b/src/Testcontainers.MySql/Testcontainers.MySql.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Nats/Testcontainers.Nats.csproj b/src/Testcontainers.Nats/Testcontainers.Nats.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Nats/Testcontainers.Nats.csproj +++ b/src/Testcontainers.Nats/Testcontainers.Nats.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Neo4j/Testcontainers.Neo4j.csproj b/src/Testcontainers.Neo4j/Testcontainers.Neo4j.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Neo4j/Testcontainers.Neo4j.csproj +++ b/src/Testcontainers.Neo4j/Testcontainers.Neo4j.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Oracle/Testcontainers.Oracle.csproj b/src/Testcontainers.Oracle/Testcontainers.Oracle.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Oracle/Testcontainers.Oracle.csproj +++ b/src/Testcontainers.Oracle/Testcontainers.Oracle.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Papercut/Testcontainers.Papercut.csproj b/src/Testcontainers.Papercut/Testcontainers.Papercut.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Papercut/Testcontainers.Papercut.csproj +++ b/src/Testcontainers.Papercut/Testcontainers.Papercut.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.PostgreSql/Testcontainers.PostgreSql.csproj b/src/Testcontainers.PostgreSql/Testcontainers.PostgreSql.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.PostgreSql/Testcontainers.PostgreSql.csproj +++ b/src/Testcontainers.PostgreSql/Testcontainers.PostgreSql.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.PubSub/Testcontainers.PubSub.csproj b/src/Testcontainers.PubSub/Testcontainers.PubSub.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.PubSub/Testcontainers.PubSub.csproj +++ b/src/Testcontainers.PubSub/Testcontainers.PubSub.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.RabbitMq/Testcontainers.RabbitMq.csproj b/src/Testcontainers.RabbitMq/Testcontainers.RabbitMq.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.RabbitMq/Testcontainers.RabbitMq.csproj +++ b/src/Testcontainers.RabbitMq/Testcontainers.RabbitMq.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.RavenDb/Testcontainers.RavenDb.csproj b/src/Testcontainers.RavenDb/Testcontainers.RavenDb.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.RavenDb/Testcontainers.RavenDb.csproj +++ b/src/Testcontainers.RavenDb/Testcontainers.RavenDb.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Redis/Testcontainers.Redis.csproj b/src/Testcontainers.Redis/Testcontainers.Redis.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Redis/Testcontainers.Redis.csproj +++ b/src/Testcontainers.Redis/Testcontainers.Redis.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Redpanda/Testcontainers.Redpanda.csproj b/src/Testcontainers.Redpanda/Testcontainers.Redpanda.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.Redpanda/Testcontainers.Redpanda.csproj +++ b/src/Testcontainers.Redpanda/Testcontainers.Redpanda.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.WebDriver/Testcontainers.WebDriver.csproj b/src/Testcontainers.WebDriver/Testcontainers.WebDriver.csproj index 8b2ed72c6..9a25b9c4d 100644 --- a/src/Testcontainers.WebDriver/Testcontainers.WebDriver.csproj +++ b/src/Testcontainers.WebDriver/Testcontainers.WebDriver.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Xunit/Testcontainers.Xunit.csproj b/src/Testcontainers.Xunit/Testcontainers.Xunit.csproj index ed8c02f10..df39a4df8 100644 --- a/src/Testcontainers.Xunit/Testcontainers.Xunit.csproj +++ b/src/Testcontainers.Xunit/Testcontainers.Xunit.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.XunitV3/Testcontainers.XunitV3.csproj b/src/Testcontainers.XunitV3/Testcontainers.XunitV3.csproj index a3b15624b..050862c3c 100644 --- a/src/Testcontainers.XunitV3/Testcontainers.XunitV3.csproj +++ b/src/Testcontainers.XunitV3/Testcontainers.XunitV3.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest $(DefineConstants);XUNIT_V3 diff --git a/src/Testcontainers/Builders/MTlsEndpointAuthenticationProvider.cs b/src/Testcontainers/Builders/MTlsEndpointAuthenticationProvider.cs index f106b7599..fddec6aa8 100644 --- a/src/Testcontainers/Builders/MTlsEndpointAuthenticationProvider.cs +++ b/src/Testcontainers/Builders/MTlsEndpointAuthenticationProvider.cs @@ -50,12 +50,15 @@ protected override X509Certificate2 GetClientCertificate() var clientCertificateFilePath = Path.Combine(CertificatesDirectoryPath, ClientCertificateFileName); var clientCertificateKeyFilePath = Path.Combine(CertificatesDirectoryPath, ClientCertificateKeyFileName); + // The certificate must be exported to PFX on Windows to avoid "No credentials are available in the security package": + // https://stackoverflow.com/questions/72096812/loading-x509certificate2-from-pem-file-results-in-no-credentials-are-available/72101855#72101855. #if NETSTANDARD return Polyfills.X509Certificate2.CreateFromPemFile(clientCertificateFilePath, clientCertificateKeyFilePath); -#else +#elif NET9_0_OR_GREATER + var certificate = X509Certificate2.CreateFromPemFile(clientCertificateFilePath, clientCertificateKeyFilePath); + return OperatingSystem.IsWindows() ? X509CertificateLoader.LoadCertificate(certificate.Export(X509ContentType.Pfx)) : certificate; +#elif NET6_0_OR_GREATER var certificate = X509Certificate2.CreateFromPemFile(clientCertificateFilePath, clientCertificateKeyFilePath); - // The certificate must be exported to PFX on Windows to avoid "No credentials are available in the security package": - // https://stackoverflow.com/questions/72096812/loading-x509certificate2-from-pem-file-results-in-no-credentials-are-available/72101855#72101855. return OperatingSystem.IsWindows() ? new X509Certificate2(certificate.Export(X509ContentType.Pfx)) : certificate; #endif } diff --git a/src/Testcontainers/Builders/TlsCredentials.cs b/src/Testcontainers/Builders/TlsCredentials.cs index b6235c3a2..acaf9dd4e 100644 --- a/src/Testcontainers/Builders/TlsCredentials.cs +++ b/src/Testcontainers/Builders/TlsCredentials.cs @@ -1,6 +1,5 @@ namespace DotNet.Testcontainers.Builders { - using System.Net; using System.Net.Http; using Docker.DotNet.X509; using Microsoft.Net.Http.Client; @@ -20,7 +19,7 @@ public override bool IsTlsCredentials() public override HttpMessageHandler GetHandler(HttpMessageHandler innerHandler) { var handler = (ManagedHandler)innerHandler; - handler.ServerCertificateValidationCallback = ServerCertificateValidationCallback ?? ServicePointManager.ServerCertificateValidationCallback; + handler.ServerCertificateValidationCallback = ServerCertificateValidationCallback; return handler; } } diff --git a/src/Testcontainers/Builders/TlsEndpointAuthenticationProvider.cs b/src/Testcontainers/Builders/TlsEndpointAuthenticationProvider.cs index 7f4c9c400..bfc7acb7b 100644 --- a/src/Testcontainers/Builders/TlsEndpointAuthenticationProvider.cs +++ b/src/Testcontainers/Builders/TlsEndpointAuthenticationProvider.cs @@ -76,7 +76,11 @@ public override IDockerEndpointAuthenticationConfiguration GetAuthConfig() /// The root certificate authority (CA). protected virtual X509Certificate2 GetCaCertificate() { +#if NET9_0_OR_GREATER + return X509CertificateLoader.LoadCertificateFromFile(Path.Combine(CertificatesDirectoryPath, CaCertificateFileName)); +#else return new X509Certificate2(Path.Combine(CertificatesDirectoryPath, CaCertificateFileName)); +#endif } /// diff --git a/src/Testcontainers/Configurations/CustomConfiguration.cs b/src/Testcontainers/Configurations/CustomConfiguration.cs index 6c627ff54..c757b7f26 100644 --- a/src/Testcontainers/Configurations/CustomConfiguration.cs +++ b/src/Testcontainers/Configurations/CustomConfiguration.cs @@ -22,7 +22,7 @@ protected virtual string GetDockerConfig(string propertyName) protected virtual Uri GetDockerHost(string propertyName) { - return _properties.TryGetValue(propertyName, out var propertyValue) && Uri.TryCreate(propertyValue, UriKind.RelativeOrAbsolute, out var dockerHost) ? dockerHost : null; + return _properties.TryGetValue(propertyName, out var propertyValue) && !string.IsNullOrEmpty(propertyValue) && Uri.TryCreate(propertyValue, UriKind.RelativeOrAbsolute, out var dockerHost) ? dockerHost : null; } protected virtual string GetDockerContext(string propertyName) @@ -142,7 +142,7 @@ private T GetPropertyValue(string propertyName) case TypeCode.String: { _ = _properties.TryGetValue(propertyName, out var propertyValue); - return (T)(object)propertyValue; + return (T)(object)(string.IsNullOrEmpty(propertyValue) ? null : propertyValue); } default: diff --git a/src/Testcontainers/Testcontainers.csproj b/src/Testcontainers/Testcontainers.csproj index 8c07b89d7..d565bfd15 100644 --- a/src/Testcontainers/Testcontainers.csproj +++ b/src/Testcontainers/Testcontainers.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;netstandard2.0;netstandard2.1 + net8.0;net9.0;netstandard2.0;netstandard2.1 latest Debug;Release DotNet.Testcontainers @@ -17,6 +17,5 @@ - diff --git a/tests/Testcontainers.ActiveMq.Tests/Testcontainers.ActiveMq.Tests.csproj b/tests/Testcontainers.ActiveMq.Tests/Testcontainers.ActiveMq.Tests.csproj index 8ef66e35f..54c6102e3 100644 --- a/tests/Testcontainers.ActiveMq.Tests/Testcontainers.ActiveMq.Tests.csproj +++ b/tests/Testcontainers.ActiveMq.Tests/Testcontainers.ActiveMq.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.ArangoDb.Tests/Testcontainers.ArangoDb.Tests.csproj b/tests/Testcontainers.ArangoDb.Tests/Testcontainers.ArangoDb.Tests.csproj index 39ba5950c..657de7b26 100644 --- a/tests/Testcontainers.ArangoDb.Tests/Testcontainers.ArangoDb.Tests.csproj +++ b/tests/Testcontainers.ArangoDb.Tests/Testcontainers.ArangoDb.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Azurite.Tests/Testcontainers.Azurite.Tests.csproj b/tests/Testcontainers.Azurite.Tests/Testcontainers.Azurite.Tests.csproj index 3c88aadf8..cd5147009 100644 --- a/tests/Testcontainers.Azurite.Tests/Testcontainers.Azurite.Tests.csproj +++ b/tests/Testcontainers.Azurite.Tests/Testcontainers.Azurite.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.BigQuery.Tests/Testcontainers.BigQuery.Tests.csproj b/tests/Testcontainers.BigQuery.Tests/Testcontainers.BigQuery.Tests.csproj index 55c66b28d..a25101fbf 100644 --- a/tests/Testcontainers.BigQuery.Tests/Testcontainers.BigQuery.Tests.csproj +++ b/tests/Testcontainers.BigQuery.Tests/Testcontainers.BigQuery.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Bigtable.Tests/Testcontainers.Bigtable.Tests.csproj b/tests/Testcontainers.Bigtable.Tests/Testcontainers.Bigtable.Tests.csproj index b35516fa0..54593d815 100644 --- a/tests/Testcontainers.Bigtable.Tests/Testcontainers.Bigtable.Tests.csproj +++ b/tests/Testcontainers.Bigtable.Tests/Testcontainers.Bigtable.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.ClickHouse.Tests/Testcontainers.ClickHouse.Tests.csproj b/tests/Testcontainers.ClickHouse.Tests/Testcontainers.ClickHouse.Tests.csproj index ff65c12a3..b357c04c4 100644 --- a/tests/Testcontainers.ClickHouse.Tests/Testcontainers.ClickHouse.Tests.csproj +++ b/tests/Testcontainers.ClickHouse.Tests/Testcontainers.ClickHouse.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.CockroachDb.Tests/Testcontainers.CockroachDb.Tests.csproj b/tests/Testcontainers.CockroachDb.Tests/Testcontainers.CockroachDb.Tests.csproj index be10f9331..e50fd8d13 100644 --- a/tests/Testcontainers.CockroachDb.Tests/Testcontainers.CockroachDb.Tests.csproj +++ b/tests/Testcontainers.CockroachDb.Tests/Testcontainers.CockroachDb.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Commons/Testcontainers.Commons.csproj b/tests/Testcontainers.Commons/Testcontainers.Commons.csproj index 213ba364a..78bc7ffd3 100644 --- a/tests/Testcontainers.Commons/Testcontainers.Commons.csproj +++ b/tests/Testcontainers.Commons/Testcontainers.Commons.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net9.0 false false false diff --git a/tests/Testcontainers.Consul.Tests/Testcontainers.Consul.Tests.csproj b/tests/Testcontainers.Consul.Tests/Testcontainers.Consul.Tests.csproj index 78dfa0749..05dc06f27 100644 --- a/tests/Testcontainers.Consul.Tests/Testcontainers.Consul.Tests.csproj +++ b/tests/Testcontainers.Consul.Tests/Testcontainers.Consul.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.CosmosDb.Tests/Testcontainers.CosmosDb.Tests.csproj b/tests/Testcontainers.CosmosDb.Tests/Testcontainers.CosmosDb.Tests.csproj index 05e90ac24..5c94128cc 100644 --- a/tests/Testcontainers.CosmosDb.Tests/Testcontainers.CosmosDb.Tests.csproj +++ b/tests/Testcontainers.CosmosDb.Tests/Testcontainers.CosmosDb.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.CouchDb.Tests/Testcontainers.CouchDb.Tests.csproj b/tests/Testcontainers.CouchDb.Tests/Testcontainers.CouchDb.Tests.csproj index fb88370dd..908fc2ecc 100644 --- a/tests/Testcontainers.CouchDb.Tests/Testcontainers.CouchDb.Tests.csproj +++ b/tests/Testcontainers.CouchDb.Tests/Testcontainers.CouchDb.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Couchbase.Tests/Testcontainers.Couchbase.Tests.csproj b/tests/Testcontainers.Couchbase.Tests/Testcontainers.Couchbase.Tests.csproj index e7e68795f..208686ab1 100644 --- a/tests/Testcontainers.Couchbase.Tests/Testcontainers.Couchbase.Tests.csproj +++ b/tests/Testcontainers.Couchbase.Tests/Testcontainers.Couchbase.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Databases.Tests/Testcontainers.Databases.Tests.csproj b/tests/Testcontainers.Databases.Tests/Testcontainers.Databases.Tests.csproj index 2ca23a8cb..7ce264f72 100644 --- a/tests/Testcontainers.Databases.Tests/Testcontainers.Databases.Tests.csproj +++ b/tests/Testcontainers.Databases.Tests/Testcontainers.Databases.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.DynamoDb.Tests/Testcontainers.DynamoDb.Tests.csproj b/tests/Testcontainers.DynamoDb.Tests/Testcontainers.DynamoDb.Tests.csproj index 82629200c..20e54716e 100644 --- a/tests/Testcontainers.DynamoDb.Tests/Testcontainers.DynamoDb.Tests.csproj +++ b/tests/Testcontainers.DynamoDb.Tests/Testcontainers.DynamoDb.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Elasticsearch.Tests/Testcontainers.Elasticsearch.Tests.csproj b/tests/Testcontainers.Elasticsearch.Tests/Testcontainers.Elasticsearch.Tests.csproj index d03e63d9d..592f39723 100644 --- a/tests/Testcontainers.Elasticsearch.Tests/Testcontainers.Elasticsearch.Tests.csproj +++ b/tests/Testcontainers.Elasticsearch.Tests/Testcontainers.Elasticsearch.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.EventStoreDb.Tests/Testcontainers.EventStoreDb.Tests.csproj b/tests/Testcontainers.EventStoreDb.Tests/Testcontainers.EventStoreDb.Tests.csproj index 9dcc41ce8..9558a60a3 100644 --- a/tests/Testcontainers.EventStoreDb.Tests/Testcontainers.EventStoreDb.Tests.csproj +++ b/tests/Testcontainers.EventStoreDb.Tests/Testcontainers.EventStoreDb.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.FakeGcsServer.Tests/Testcontainers.FakeGcsServer.Tests.csproj b/tests/Testcontainers.FakeGcsServer.Tests/Testcontainers.FakeGcsServer.Tests.csproj index c9ffa0c94..23ca050d7 100644 --- a/tests/Testcontainers.FakeGcsServer.Tests/Testcontainers.FakeGcsServer.Tests.csproj +++ b/tests/Testcontainers.FakeGcsServer.Tests/Testcontainers.FakeGcsServer.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.FirebirdSql.Tests/Testcontainers.FirebirdSql.Tests.csproj b/tests/Testcontainers.FirebirdSql.Tests/Testcontainers.FirebirdSql.Tests.csproj index f27fd18a4..ab085ac17 100644 --- a/tests/Testcontainers.FirebirdSql.Tests/Testcontainers.FirebirdSql.Tests.csproj +++ b/tests/Testcontainers.FirebirdSql.Tests/Testcontainers.FirebirdSql.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Firestore.Tests/Testcontainers.Firestore.Tests.csproj b/tests/Testcontainers.Firestore.Tests/Testcontainers.Firestore.Tests.csproj index 78e4ed1a4..fc800288d 100644 --- a/tests/Testcontainers.Firestore.Tests/Testcontainers.Firestore.Tests.csproj +++ b/tests/Testcontainers.Firestore.Tests/Testcontainers.Firestore.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.InfluxDb.Tests/Testcontainers.InfluxDb.Tests.csproj b/tests/Testcontainers.InfluxDb.Tests/Testcontainers.InfluxDb.Tests.csproj index 658d3960a..453ae7544 100644 --- a/tests/Testcontainers.InfluxDb.Tests/Testcontainers.InfluxDb.Tests.csproj +++ b/tests/Testcontainers.InfluxDb.Tests/Testcontainers.InfluxDb.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.JanusGraph.Tests/Testcontainers.JanusGraph.Tests.csproj b/tests/Testcontainers.JanusGraph.Tests/Testcontainers.JanusGraph.Tests.csproj index 3e1de67b2..dbae2d636 100644 --- a/tests/Testcontainers.JanusGraph.Tests/Testcontainers.JanusGraph.Tests.csproj +++ b/tests/Testcontainers.JanusGraph.Tests/Testcontainers.JanusGraph.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.K3s.Tests/Testcontainers.K3s.Tests.csproj b/tests/Testcontainers.K3s.Tests/Testcontainers.K3s.Tests.csproj index 370af3d95..cb00d41bb 100644 --- a/tests/Testcontainers.K3s.Tests/Testcontainers.K3s.Tests.csproj +++ b/tests/Testcontainers.K3s.Tests/Testcontainers.K3s.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Kafka.Tests/Testcontainers.Kafka.Tests.csproj b/tests/Testcontainers.Kafka.Tests/Testcontainers.Kafka.Tests.csproj index 43a5050ab..94298bbaa 100644 --- a/tests/Testcontainers.Kafka.Tests/Testcontainers.Kafka.Tests.csproj +++ b/tests/Testcontainers.Kafka.Tests/Testcontainers.Kafka.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Keycloak.Tests/Testcontainers.Keycloak.Tests.csproj b/tests/Testcontainers.Keycloak.Tests/Testcontainers.Keycloak.Tests.csproj index 73fd4941c..9313cee28 100644 --- a/tests/Testcontainers.Keycloak.Tests/Testcontainers.Keycloak.Tests.csproj +++ b/tests/Testcontainers.Keycloak.Tests/Testcontainers.Keycloak.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Kusto.Tests/Testcontainers.Kusto.Tests.csproj b/tests/Testcontainers.Kusto.Tests/Testcontainers.Kusto.Tests.csproj index c2603dcc5..dd638c6fb 100644 --- a/tests/Testcontainers.Kusto.Tests/Testcontainers.Kusto.Tests.csproj +++ b/tests/Testcontainers.Kusto.Tests/Testcontainers.Kusto.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.LocalStack.Tests/Testcontainers.LocalStack.Tests.csproj b/tests/Testcontainers.LocalStack.Tests/Testcontainers.LocalStack.Tests.csproj index ee7691d2c..36a47d1f2 100644 --- a/tests/Testcontainers.LocalStack.Tests/Testcontainers.LocalStack.Tests.csproj +++ b/tests/Testcontainers.LocalStack.Tests/Testcontainers.LocalStack.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.MariaDb.Tests/Testcontainers.MariaDb.Tests.csproj b/tests/Testcontainers.MariaDb.Tests/Testcontainers.MariaDb.Tests.csproj index a931dda23..bb56ee175 100644 --- a/tests/Testcontainers.MariaDb.Tests/Testcontainers.MariaDb.Tests.csproj +++ b/tests/Testcontainers.MariaDb.Tests/Testcontainers.MariaDb.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Milvus.Tests/Testcontainers.Milvus.Tests.csproj b/tests/Testcontainers.Milvus.Tests/Testcontainers.Milvus.Tests.csproj index dfb79e9e2..3dac2ad9b 100644 --- a/tests/Testcontainers.Milvus.Tests/Testcontainers.Milvus.Tests.csproj +++ b/tests/Testcontainers.Milvus.Tests/Testcontainers.Milvus.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Minio.Tests/Testcontainers.Minio.Tests.csproj b/tests/Testcontainers.Minio.Tests/Testcontainers.Minio.Tests.csproj index e12ab324c..14cbeb106 100644 --- a/tests/Testcontainers.Minio.Tests/Testcontainers.Minio.Tests.csproj +++ b/tests/Testcontainers.Minio.Tests/Testcontainers.Minio.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.MongoDb.Tests/Testcontainers.MongoDb.Tests.csproj b/tests/Testcontainers.MongoDb.Tests/Testcontainers.MongoDb.Tests.csproj index 4afae395e..32acc156d 100644 --- a/tests/Testcontainers.MongoDb.Tests/Testcontainers.MongoDb.Tests.csproj +++ b/tests/Testcontainers.MongoDb.Tests/Testcontainers.MongoDb.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.MsSql.Tests/Testcontainers.MsSql.Tests.csproj b/tests/Testcontainers.MsSql.Tests/Testcontainers.MsSql.Tests.csproj index 506e8b9f1..ad2862d61 100644 --- a/tests/Testcontainers.MsSql.Tests/Testcontainers.MsSql.Tests.csproj +++ b/tests/Testcontainers.MsSql.Tests/Testcontainers.MsSql.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.MySql.Tests/Testcontainers.MySql.Tests.csproj b/tests/Testcontainers.MySql.Tests/Testcontainers.MySql.Tests.csproj index 6700b6115..ef10916ae 100644 --- a/tests/Testcontainers.MySql.Tests/Testcontainers.MySql.Tests.csproj +++ b/tests/Testcontainers.MySql.Tests/Testcontainers.MySql.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Nats.Tests/Testcontainers.Nats.Tests.csproj b/tests/Testcontainers.Nats.Tests/Testcontainers.Nats.Tests.csproj index d3cdef8c9..40bc1472e 100644 --- a/tests/Testcontainers.Nats.Tests/Testcontainers.Nats.Tests.csproj +++ b/tests/Testcontainers.Nats.Tests/Testcontainers.Nats.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Neo4j.Tests/Testcontainers.Neo4j.Tests.csproj b/tests/Testcontainers.Neo4j.Tests/Testcontainers.Neo4j.Tests.csproj index 87c46a36f..db659c7d3 100644 --- a/tests/Testcontainers.Neo4j.Tests/Testcontainers.Neo4j.Tests.csproj +++ b/tests/Testcontainers.Neo4j.Tests/Testcontainers.Neo4j.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Oracle.Tests/Testcontainers.Oracle.Tests.csproj b/tests/Testcontainers.Oracle.Tests/Testcontainers.Oracle.Tests.csproj index fa9f1c7a7..4d619cd84 100644 --- a/tests/Testcontainers.Oracle.Tests/Testcontainers.Oracle.Tests.csproj +++ b/tests/Testcontainers.Oracle.Tests/Testcontainers.Oracle.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Papercut.Tests/Testcontainers.Papercut.Tests.csproj b/tests/Testcontainers.Papercut.Tests/Testcontainers.Papercut.Tests.csproj index 485fcc0f8..a8ab089db 100644 --- a/tests/Testcontainers.Papercut.Tests/Testcontainers.Papercut.Tests.csproj +++ b/tests/Testcontainers.Papercut.Tests/Testcontainers.Papercut.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Platform.Linux.Tests/Testcontainers.Platform.Linux.Tests.csproj b/tests/Testcontainers.Platform.Linux.Tests/Testcontainers.Platform.Linux.Tests.csproj index d7c3cd709..e3f1b0f2b 100644 --- a/tests/Testcontainers.Platform.Linux.Tests/Testcontainers.Platform.Linux.Tests.csproj +++ b/tests/Testcontainers.Platform.Linux.Tests/Testcontainers.Platform.Linux.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Platform.Windows.Tests/Testcontainers.Platform.Windows.Tests.csproj b/tests/Testcontainers.Platform.Windows.Tests/Testcontainers.Platform.Windows.Tests.csproj index 0282b5373..1bcfa87ff 100644 --- a/tests/Testcontainers.Platform.Windows.Tests/Testcontainers.Platform.Windows.Tests.csproj +++ b/tests/Testcontainers.Platform.Windows.Tests/Testcontainers.Platform.Windows.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.PostgreSql.Tests/Testcontainers.PostgreSql.Tests.csproj b/tests/Testcontainers.PostgreSql.Tests/Testcontainers.PostgreSql.Tests.csproj index a072d6b9d..4e0e76e9a 100644 --- a/tests/Testcontainers.PostgreSql.Tests/Testcontainers.PostgreSql.Tests.csproj +++ b/tests/Testcontainers.PostgreSql.Tests/Testcontainers.PostgreSql.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.PubSub.Tests/Testcontainers.PubSub.Tests.csproj b/tests/Testcontainers.PubSub.Tests/Testcontainers.PubSub.Tests.csproj index bc5d69f07..4fb269c13 100644 --- a/tests/Testcontainers.PubSub.Tests/Testcontainers.PubSub.Tests.csproj +++ b/tests/Testcontainers.PubSub.Tests/Testcontainers.PubSub.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Pulsar.Tests/Testcontainers.Pulsar.Tests.csproj b/tests/Testcontainers.Pulsar.Tests/Testcontainers.Pulsar.Tests.csproj index 41dd297d7..64f1820f4 100644 --- a/tests/Testcontainers.Pulsar.Tests/Testcontainers.Pulsar.Tests.csproj +++ b/tests/Testcontainers.Pulsar.Tests/Testcontainers.Pulsar.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.RabbitMq.Tests/Testcontainers.RabbitMq.Tests.csproj b/tests/Testcontainers.RabbitMq.Tests/Testcontainers.RabbitMq.Tests.csproj index d6037faeb..808f95f1c 100644 --- a/tests/Testcontainers.RabbitMq.Tests/Testcontainers.RabbitMq.Tests.csproj +++ b/tests/Testcontainers.RabbitMq.Tests/Testcontainers.RabbitMq.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.RavenDb.Tests/Testcontainers.RavenDb.Tests.csproj b/tests/Testcontainers.RavenDb.Tests/Testcontainers.RavenDb.Tests.csproj index 36b0dec14..bfc7f8507 100644 --- a/tests/Testcontainers.RavenDb.Tests/Testcontainers.RavenDb.Tests.csproj +++ b/tests/Testcontainers.RavenDb.Tests/Testcontainers.RavenDb.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Redis.Tests/Testcontainers.Redis.Tests.csproj b/tests/Testcontainers.Redis.Tests/Testcontainers.Redis.Tests.csproj index eef8f9039..6bb7f625a 100644 --- a/tests/Testcontainers.Redis.Tests/Testcontainers.Redis.Tests.csproj +++ b/tests/Testcontainers.Redis.Tests/Testcontainers.Redis.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Redpanda.Tests/Testcontainers.Redpanda.Tests.csproj b/tests/Testcontainers.Redpanda.Tests/Testcontainers.Redpanda.Tests.csproj index b923ecfee..a8ecc0ab2 100644 --- a/tests/Testcontainers.Redpanda.Tests/Testcontainers.Redpanda.Tests.csproj +++ b/tests/Testcontainers.Redpanda.Tests/Testcontainers.Redpanda.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.ResourceReaper.Tests/Testcontainers.ResourceReaper.Tests.csproj b/tests/Testcontainers.ResourceReaper.Tests/Testcontainers.ResourceReaper.Tests.csproj index 90e23ccc5..5a65e58d5 100644 --- a/tests/Testcontainers.ResourceReaper.Tests/Testcontainers.ResourceReaper.Tests.csproj +++ b/tests/Testcontainers.ResourceReaper.Tests/Testcontainers.ResourceReaper.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false Debug;Release diff --git a/tests/Testcontainers.Tests/Testcontainers.Tests.csproj b/tests/Testcontainers.Tests/Testcontainers.Tests.csproj index caa03761c..b6640a881 100644 --- a/tests/Testcontainers.Tests/Testcontainers.Tests.csproj +++ b/tests/Testcontainers.Tests/Testcontainers.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false Debug;Release diff --git a/tests/Testcontainers.Tests/Unit/Configurations/CustomConfigurationTest.cs b/tests/Testcontainers.Tests/Unit/Configurations/CustomConfigurationTest.cs index 1ab8652d2..260dfa067 100644 --- a/tests/Testcontainers.Tests/Unit/Configurations/CustomConfigurationTest.cs +++ b/tests/Testcontainers.Tests/Unit/Configurations/CustomConfigurationTest.cs @@ -17,6 +17,7 @@ static EnvironmentConfigurationTest() { EnvironmentVariables.Add("DOCKER_CONFIG"); EnvironmentVariables.Add("DOCKER_HOST"); + EnvironmentVariables.Add("DOCKER_CONTEXT"); EnvironmentVariables.Add("DOCKER_AUTH_CONFIG"); EnvironmentVariables.Add("DOCKER_CERT_PATH"); EnvironmentVariables.Add("DOCKER_TLS"); diff --git a/tests/Testcontainers.WebDriver.Tests/Testcontainers.WebDriver.Tests.csproj b/tests/Testcontainers.WebDriver.Tests/Testcontainers.WebDriver.Tests.csproj index 3a009ad81..48eff329a 100644 --- a/tests/Testcontainers.WebDriver.Tests/Testcontainers.WebDriver.Tests.csproj +++ b/tests/Testcontainers.WebDriver.Tests/Testcontainers.WebDriver.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/Testcontainers.Xunit.Tests/Testcontainers.Xunit.Tests.csproj b/tests/Testcontainers.Xunit.Tests/Testcontainers.Xunit.Tests.csproj index cb1e8400d..423bfee78 100644 --- a/tests/Testcontainers.Xunit.Tests/Testcontainers.Xunit.Tests.csproj +++ b/tests/Testcontainers.Xunit.Tests/Testcontainers.Xunit.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false