From 894319e5ea13638d261081d3f7a84c92d482af0b Mon Sep 17 00:00:00 2001 From: Andre Hofmeister <9199345+HofmeisterAn@users.noreply.github.com> Date: Sat, 2 Mar 2024 18:37:35 +0100 Subject: [PATCH] feat: Add support for the target frameworks net6.0 and net8.0 (#1133) --- .devcontainer/devcontainer.json | 7 +++---- .../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 +- .../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 +- src/Testcontainers.K3s/Testcontainers.K3s.csproj | 2 +- src/Testcontainers.Kafka/Testcontainers.Kafka.csproj | 2 +- .../Testcontainers.Keycloak.csproj | 2 +- src/Testcontainers.Kusto/Testcontainers.Kusto.csproj | 2 +- .../Testcontainers.LocalStack.csproj | 2 +- .../Testcontainers.MariaDb.csproj | 2 +- src/Testcontainers.Minio/Testcontainers.Minio.csproj | 2 +- .../Testcontainers.MongoDb.csproj | 2 +- src/Testcontainers.MsSql/Testcontainers.MsSql.csproj | 2 +- src/Testcontainers.MySql/Testcontainers.MySql.csproj | 2 +- src/Testcontainers.Nats/Testcontainers.Nats.csproj | 2 +- src/Testcontainers.Neo4j/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 +- src/Testcontainers.Redis/Testcontainers.Redis.csproj | 2 +- .../Testcontainers.Redpanda.csproj | 2 +- .../Testcontainers.SqlEdge.csproj | 2 +- .../Testcontainers.WebDriver.csproj | 2 +- src/Testcontainers/Containers/ResourceReaper.cs | 11 ++++++++--- .../Containers/ResourceReaperException.cs | 6 ------ src/Testcontainers/Testcontainers.csproj | 2 +- 46 files changed, 54 insertions(+), 56 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 39b19fed8..3bf0cb3a9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,16 +13,15 @@ "ghcr.io/devcontainers/features/docker-in-docker:2": { "moby": true }, - "ghcr.io/devcontainers/features/dotnet:1": { - "version": "8.0.100", + "ghcr.io/devcontainers/features/dotnet:2.0.5": { + "version": "8.0.200", "installUsingApt": false } }, "customizations": { "extensions": [ - "formulahendry.dotnet-test-explorer", "ms-azuretools.vscode-docker", - "ms-dotnettools.csharp" + "ms-dotnettools.csdevkit" ], "settings": { "omnisharp.path": "latest" // https://github.com/OmniSharp/omnisharp-vscode/issues/5410#issuecomment-1284531542. diff --git a/src/Templates/CSharp/Testcontainers.ModuleName/Testcontainers.ModuleName.csproj b/src/Templates/CSharp/Testcontainers.ModuleName/Testcontainers.ModuleName.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Templates/CSharp/Testcontainers.ModuleName/Testcontainers.ModuleName.csproj +++ b/src/Templates/CSharp/Testcontainers.ModuleName/Testcontainers.ModuleName.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.ActiveMq/Testcontainers.ActiveMq.csproj b/src/Testcontainers.ActiveMq/Testcontainers.ActiveMq.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.ActiveMq/Testcontainers.ActiveMq.csproj +++ b/src/Testcontainers.ActiveMq/Testcontainers.ActiveMq.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.ArangoDb/Testcontainers.ArangoDb.csproj b/src/Testcontainers.ArangoDb/Testcontainers.ArangoDb.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.ArangoDb/Testcontainers.ArangoDb.csproj +++ b/src/Testcontainers.ArangoDb/Testcontainers.ArangoDb.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Azurite/Testcontainers.Azurite.csproj b/src/Testcontainers.Azurite/Testcontainers.Azurite.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Azurite/Testcontainers.Azurite.csproj +++ b/src/Testcontainers.Azurite/Testcontainers.Azurite.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.BigQuery/Testcontainers.BigQuery.csproj b/src/Testcontainers.BigQuery/Testcontainers.BigQuery.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.BigQuery/Testcontainers.BigQuery.csproj +++ b/src/Testcontainers.BigQuery/Testcontainers.BigQuery.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Bigtable/Testcontainers.Bigtable.csproj b/src/Testcontainers.Bigtable/Testcontainers.Bigtable.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Bigtable/Testcontainers.Bigtable.csproj +++ b/src/Testcontainers.Bigtable/Testcontainers.Bigtable.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.ClickHouse/Testcontainers.ClickHouse.csproj b/src/Testcontainers.ClickHouse/Testcontainers.ClickHouse.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.ClickHouse/Testcontainers.ClickHouse.csproj +++ b/src/Testcontainers.ClickHouse/Testcontainers.ClickHouse.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.CockroachDb/Testcontainers.CockroachDb.csproj b/src/Testcontainers.CockroachDb/Testcontainers.CockroachDb.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.CockroachDb/Testcontainers.CockroachDb.csproj +++ b/src/Testcontainers.CockroachDb/Testcontainers.CockroachDb.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Consul/Testcontainers.Consul.csproj b/src/Testcontainers.Consul/Testcontainers.Consul.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Consul/Testcontainers.Consul.csproj +++ b/src/Testcontainers.Consul/Testcontainers.Consul.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.CosmosDb/Testcontainers.CosmosDb.csproj b/src/Testcontainers.CosmosDb/Testcontainers.CosmosDb.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.CosmosDb/Testcontainers.CosmosDb.csproj +++ b/src/Testcontainers.CosmosDb/Testcontainers.CosmosDb.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.CouchDb/Testcontainers.CouchDb.csproj b/src/Testcontainers.CouchDb/Testcontainers.CouchDb.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.CouchDb/Testcontainers.CouchDb.csproj +++ b/src/Testcontainers.CouchDb/Testcontainers.CouchDb.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Couchbase/Testcontainers.Couchbase.csproj b/src/Testcontainers.Couchbase/Testcontainers.Couchbase.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Couchbase/Testcontainers.Couchbase.csproj +++ b/src/Testcontainers.Couchbase/Testcontainers.Couchbase.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.DynamoDb/Testcontainers.DynamoDb.csproj b/src/Testcontainers.DynamoDb/Testcontainers.DynamoDb.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.DynamoDb/Testcontainers.DynamoDb.csproj +++ b/src/Testcontainers.DynamoDb/Testcontainers.DynamoDb.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Elasticsearch/Testcontainers.Elasticsearch.csproj b/src/Testcontainers.Elasticsearch/Testcontainers.Elasticsearch.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Elasticsearch/Testcontainers.Elasticsearch.csproj +++ b/src/Testcontainers.Elasticsearch/Testcontainers.Elasticsearch.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.EventStoreDb/Testcontainers.EventStoreDb.csproj b/src/Testcontainers.EventStoreDb/Testcontainers.EventStoreDb.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.EventStoreDb/Testcontainers.EventStoreDb.csproj +++ b/src/Testcontainers.EventStoreDb/Testcontainers.EventStoreDb.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.FakeGcsServer/Testcontainers.FakeGcsServer.csproj b/src/Testcontainers.FakeGcsServer/Testcontainers.FakeGcsServer.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.FakeGcsServer/Testcontainers.FakeGcsServer.csproj +++ b/src/Testcontainers.FakeGcsServer/Testcontainers.FakeGcsServer.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.FirebirdSql/Testcontainers.FirebirdSql.csproj b/src/Testcontainers.FirebirdSql/Testcontainers.FirebirdSql.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.FirebirdSql/Testcontainers.FirebirdSql.csproj +++ b/src/Testcontainers.FirebirdSql/Testcontainers.FirebirdSql.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Firestore/Testcontainers.Firestore.csproj b/src/Testcontainers.Firestore/Testcontainers.Firestore.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Firestore/Testcontainers.Firestore.csproj +++ b/src/Testcontainers.Firestore/Testcontainers.Firestore.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.InfluxDb/Testcontainers.InfluxDb.csproj b/src/Testcontainers.InfluxDb/Testcontainers.InfluxDb.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.InfluxDb/Testcontainers.InfluxDb.csproj +++ b/src/Testcontainers.InfluxDb/Testcontainers.InfluxDb.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.JanusGraph/Testcontainers.JanusGraph.csproj b/src/Testcontainers.JanusGraph/Testcontainers.JanusGraph.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.JanusGraph/Testcontainers.JanusGraph.csproj +++ b/src/Testcontainers.JanusGraph/Testcontainers.JanusGraph.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.K3s/Testcontainers.K3s.csproj b/src/Testcontainers.K3s/Testcontainers.K3s.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.K3s/Testcontainers.K3s.csproj +++ b/src/Testcontainers.K3s/Testcontainers.K3s.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Kafka/Testcontainers.Kafka.csproj b/src/Testcontainers.Kafka/Testcontainers.Kafka.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Kafka/Testcontainers.Kafka.csproj +++ b/src/Testcontainers.Kafka/Testcontainers.Kafka.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Keycloak/Testcontainers.Keycloak.csproj b/src/Testcontainers.Keycloak/Testcontainers.Keycloak.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Keycloak/Testcontainers.Keycloak.csproj +++ b/src/Testcontainers.Keycloak/Testcontainers.Keycloak.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Kusto/Testcontainers.Kusto.csproj b/src/Testcontainers.Kusto/Testcontainers.Kusto.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Kusto/Testcontainers.Kusto.csproj +++ b/src/Testcontainers.Kusto/Testcontainers.Kusto.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.LocalStack/Testcontainers.LocalStack.csproj b/src/Testcontainers.LocalStack/Testcontainers.LocalStack.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.LocalStack/Testcontainers.LocalStack.csproj +++ b/src/Testcontainers.LocalStack/Testcontainers.LocalStack.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.MariaDb/Testcontainers.MariaDb.csproj b/src/Testcontainers.MariaDb/Testcontainers.MariaDb.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.MariaDb/Testcontainers.MariaDb.csproj +++ b/src/Testcontainers.MariaDb/Testcontainers.MariaDb.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Minio/Testcontainers.Minio.csproj b/src/Testcontainers.Minio/Testcontainers.Minio.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Minio/Testcontainers.Minio.csproj +++ b/src/Testcontainers.Minio/Testcontainers.Minio.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.MongoDb/Testcontainers.MongoDb.csproj b/src/Testcontainers.MongoDb/Testcontainers.MongoDb.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.MongoDb/Testcontainers.MongoDb.csproj +++ b/src/Testcontainers.MongoDb/Testcontainers.MongoDb.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.MsSql/Testcontainers.MsSql.csproj b/src/Testcontainers.MsSql/Testcontainers.MsSql.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.MsSql/Testcontainers.MsSql.csproj +++ b/src/Testcontainers.MsSql/Testcontainers.MsSql.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.MySql/Testcontainers.MySql.csproj b/src/Testcontainers.MySql/Testcontainers.MySql.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.MySql/Testcontainers.MySql.csproj +++ b/src/Testcontainers.MySql/Testcontainers.MySql.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Nats/Testcontainers.Nats.csproj b/src/Testcontainers.Nats/Testcontainers.Nats.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Nats/Testcontainers.Nats.csproj +++ b/src/Testcontainers.Nats/Testcontainers.Nats.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Neo4j/Testcontainers.Neo4j.csproj b/src/Testcontainers.Neo4j/Testcontainers.Neo4j.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Neo4j/Testcontainers.Neo4j.csproj +++ b/src/Testcontainers.Neo4j/Testcontainers.Neo4j.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Oracle/Testcontainers.Oracle.csproj b/src/Testcontainers.Oracle/Testcontainers.Oracle.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Oracle/Testcontainers.Oracle.csproj +++ b/src/Testcontainers.Oracle/Testcontainers.Oracle.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Papercut/Testcontainers.Papercut.csproj b/src/Testcontainers.Papercut/Testcontainers.Papercut.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Papercut/Testcontainers.Papercut.csproj +++ b/src/Testcontainers.Papercut/Testcontainers.Papercut.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.PostgreSql/Testcontainers.PostgreSql.csproj b/src/Testcontainers.PostgreSql/Testcontainers.PostgreSql.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.PostgreSql/Testcontainers.PostgreSql.csproj +++ b/src/Testcontainers.PostgreSql/Testcontainers.PostgreSql.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.PubSub/Testcontainers.PubSub.csproj b/src/Testcontainers.PubSub/Testcontainers.PubSub.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.PubSub/Testcontainers.PubSub.csproj +++ b/src/Testcontainers.PubSub/Testcontainers.PubSub.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.RabbitMq/Testcontainers.RabbitMq.csproj b/src/Testcontainers.RabbitMq/Testcontainers.RabbitMq.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.RabbitMq/Testcontainers.RabbitMq.csproj +++ b/src/Testcontainers.RabbitMq/Testcontainers.RabbitMq.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.RavenDb/Testcontainers.RavenDb.csproj b/src/Testcontainers.RavenDb/Testcontainers.RavenDb.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.RavenDb/Testcontainers.RavenDb.csproj +++ b/src/Testcontainers.RavenDb/Testcontainers.RavenDb.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Redis/Testcontainers.Redis.csproj b/src/Testcontainers.Redis/Testcontainers.Redis.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Redis/Testcontainers.Redis.csproj +++ b/src/Testcontainers.Redis/Testcontainers.Redis.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.Redpanda/Testcontainers.Redpanda.csproj b/src/Testcontainers.Redpanda/Testcontainers.Redpanda.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.Redpanda/Testcontainers.Redpanda.csproj +++ b/src/Testcontainers.Redpanda/Testcontainers.Redpanda.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.SqlEdge/Testcontainers.SqlEdge.csproj b/src/Testcontainers.SqlEdge/Testcontainers.SqlEdge.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.SqlEdge/Testcontainers.SqlEdge.csproj +++ b/src/Testcontainers.SqlEdge/Testcontainers.SqlEdge.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers.WebDriver/Testcontainers.WebDriver.csproj b/src/Testcontainers.WebDriver/Testcontainers.WebDriver.csproj index a108060b3..8b2ed72c6 100644 --- a/src/Testcontainers.WebDriver/Testcontainers.WebDriver.csproj +++ b/src/Testcontainers.WebDriver/Testcontainers.WebDriver.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 latest diff --git a/src/Testcontainers/Containers/ResourceReaper.cs b/src/Testcontainers/Containers/ResourceReaper.cs index d3c9af560..c068998e9 100644 --- a/src/Testcontainers/Containers/ResourceReaper.cs +++ b/src/Testcontainers/Containers/ResourceReaper.cs @@ -279,7 +279,7 @@ private async Task MaintainRyukConnection(TaskCompletionSource ryukInitial { if (!TryGetEndpoint(out var host, out var port)) { - await Task.Delay(TimeSpan.FromSeconds(RetryTimeoutInSeconds), default) + await Task.Delay(TimeSpan.FromSeconds(RetryTimeoutInSeconds), default(CancellationToken)) .ConfigureAwait(false); continue; @@ -291,8 +291,13 @@ await Task.Delay(TimeSpan.FromSeconds(RetryTimeoutInSeconds), default) try { +#if NET6_0_OR_GREATER + await tcpClient.ConnectAsync(host, port, ct) + .ConfigureAwait(false); +#else await tcpClient.ConnectAsync(host, port) .ConfigureAwait(false); +#endif var stream = tcpClient.GetStream(); @@ -384,14 +389,14 @@ await Task.Delay(TimeSpan.FromSeconds(RetryTimeoutInSeconds), ct) { _resourceReaperContainer.Logger.CanNotConnectToResourceReaper(SessionId, host, port, e); - await Task.Delay(TimeSpan.FromSeconds(RetryTimeoutInSeconds), default) + await Task.Delay(TimeSpan.FromSeconds(RetryTimeoutInSeconds), default(CancellationToken)) .ConfigureAwait(false); } catch (Exception e) { _resourceReaperContainer.Logger.LostConnectionToResourceReaper(SessionId, host, port, e); - await Task.Delay(TimeSpan.FromSeconds(RetryTimeoutInSeconds), default) + await Task.Delay(TimeSpan.FromSeconds(RetryTimeoutInSeconds), default(CancellationToken)) .ConfigureAwait(false); } } diff --git a/src/Testcontainers/Containers/ResourceReaperException.cs b/src/Testcontainers/Containers/ResourceReaperException.cs index 558b43020..c79bf79b4 100644 --- a/src/Testcontainers/Containers/ResourceReaperException.cs +++ b/src/Testcontainers/Containers/ResourceReaperException.cs @@ -1,7 +1,6 @@ namespace DotNet.Testcontainers.Containers { using System; - using System.Runtime.Serialization; [Serializable] public sealed class ResourceReaperException : Exception @@ -10,10 +9,5 @@ public ResourceReaperException(string message) : base(message) { } - - private ResourceReaperException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } } } diff --git a/src/Testcontainers/Testcontainers.csproj b/src/Testcontainers/Testcontainers.csproj index 591f98636..ee103ae2d 100644 --- a/src/Testcontainers/Testcontainers.csproj +++ b/src/Testcontainers/Testcontainers.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1 + net6.0;net8.0;netstandard2.0;netstandard2.1 Debug;Release DotNet.Testcontainers