Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,776 changes: 1,707 additions & 69 deletions src/JD.Efcpt.Build.Tasks/packages.lock.json

Large diffs are not rendered by default.

1,034 changes: 978 additions & 56 deletions src/JD.Efcpt.Build/packages.lock.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ private sealed record SchemaGenerationResult(

private static async Task<TestContext> SetupSqlServerWithSampleSchema()
{
var container = new MsSqlBuilder()
.WithImage("mcr.microsoft.com/mssql/server:2022-latest")
var container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-latest")
.Build();

await container.StartAsync();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ await Given("invalid connection string", SetupInvalidConnectionString)

private static async Task<TestContext> SetupDatabaseWithSchema()
{
var container = new MsSqlBuilder()
.WithImage("mcr.microsoft.com/mssql/server:2022-latest")
var container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-latest")
.Build();

await container.StartAsync();
Expand All @@ -128,8 +127,7 @@ private static async Task<TestContext> SetupDatabaseWithSchema()

private static async Task<TestContext> SetupComprehensiveSchema()
{
var container = new MsSqlBuilder()
.WithImage("mcr.microsoft.com/mssql/server:2022-latest")
var container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-latest")
.Build();

await container.StartAsync();
Expand All @@ -146,8 +144,7 @@ private static async Task<TestContext> SetupComprehensiveSchema()

private static async Task<TestContext> SetupEmptyDatabase()
{
var container = new MsSqlBuilder()
.WithImage("mcr.microsoft.com/mssql/server:2022-latest")
var container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-latest")
.Build();

await container.StartAsync();
Expand All @@ -164,8 +161,7 @@ private static async Task<TestContext> SetupEmptyDatabase()

private static Task<TestContext> SetupInvalidConnectionString()
{
var container = new MsSqlBuilder()
.WithImage("mcr.microsoft.com/mssql/server:2022-latest")
var container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-latest")
.Build();

// Don't start the container - connection will fail
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ private sealed record FingerprintResult(TestContext Context, string Fingerprint1
private static async Task<TestContext> SetupEmptyDatabase()
{
// LocalStack Snowflake uses port 4566 and requires auth token
var container = new ContainerBuilder()
.WithImage("localstack/snowflake:latest")
var container = new ContainerBuilder("localstack/snowflake:latest")
.WithPortBinding(4566, true)
.WithEnvironment("LOCALSTACK_AUTH_TOKEN", LocalStackAuthToken!)
.WithEnvironment("SF_DEFAULT_USER", "test")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ private sealed record SchemaResult(

private static async Task<TestContext> SetupEmptyDatabase()
{
var container = new MsSqlBuilder()
.WithImage("mcr.microsoft.com/mssql/server:2022-latest")
var container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-latest")
.Build();

await container.StartAsync();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="8.8.0" />
<PackageReference Include="Testcontainers.MsSql" Version="4.4.0" />
<PackageReference Include="Testcontainers.MsSql" Version="4.10.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ public async ValueTask DisposeAsync()

private async Task<string> SetupDatabaseWithTestSchema()
{
_container = new MsSqlBuilder()
.WithImage("mcr.microsoft.com/mssql/server:2022-latest")
_container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-latest")
.Build();

await _container.StartAsync();
Expand Down
42 changes: 23 additions & 19 deletions tests/JD.Efcpt.Sdk.IntegrationTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
},
"Testcontainers.MsSql": {
"type": "Direct",
"requested": "[4.4.0, )",
"resolved": "4.4.0",
"contentHash": "Ghh7rK17G7Lf6fhmfnen2Jo3X6x3xrXaiakeR4KkR1bHFACeYSlbBvQhuAz1Vx+aVkcCzoLpbxexVwqnQocvcw==",
"requested": "[4.10.0, )",
"resolved": "4.10.0",
"contentHash": "2FnZFymCGNBB/bP38C8dFpFZjI7JSp1P8sVsoejEPd56NPDIc6CSZHnIJ6eu9arAbTyJ7+pGAbVyZ6notq/tVw==",
"dependencies": {
"Testcontainers": "4.4.0"
"Testcontainers": "4.10.0"
}
},
"xunit": {
Expand Down Expand Up @@ -101,20 +101,23 @@
},
"BouncyCastle.Cryptography": {
"type": "Transitive",
"resolved": "2.4.0",
"contentHash": "SwXsAV3sMvAU/Nn31pbjhWurYSjJ+/giI/0n6tCrYoupEK34iIHCuk3STAd9fx8yudM85KkLSVdn951vTng/vQ=="
"resolved": "2.6.2",
"contentHash": "7oWOcvnntmMKNzDLsdxAYqApt+AjpRpP2CShjMfIa3umZ42UQMvH0tl1qAliYPNYO6vTdcGMqnRrCPmsfzTI1w=="
},
"Docker.DotNet.Enhanced": {
"type": "Transitive",
"resolved": "3.126.1",
"contentHash": "UPyLBLBaVE3s7OCWM0h5g9w6mUOag5sOIP5CldFQekIWo/gHixgZR+o5fG7eCFH4ZdKlvBGM4ALFuOyPoKoJ3A=="
"resolved": "3.131.1",
"contentHash": "hGLHCNUsQbT2Ab/HUznRnNqYZQs40zInXa3eLwYjeNyfUYbw1pqqDGqcOLl5uGepS8IuigEYakEdAcVT/2ezYg==",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "8.0.3"
}
},
"Docker.DotNet.Enhanced.X509": {
"type": "Transitive",
"resolved": "3.126.1",
"contentHash": "XFHMC/iWHbloQgg9apZrxu010DmSamaAggu8nomCqTeotGyUGkv2Tt/aqk1ljC/4tjtTrb9LtFQwYpwZbMbiKg==",
"resolved": "3.131.1",
"contentHash": "8FU7zmttFQzp0xb0EPupxQ0nGtC2cTpukgh3jMxMT8luj5TSDyzIKTnroDpXCjpg9P2fV+6JIvC+IetsMEfyBA==",
"dependencies": {
"Docker.DotNet.Enhanced": "3.126.1"
"Docker.DotNet.Enhanced": "3.131.1"
}
},
"Microsoft.Bcl.AsyncInterfaces": {
Expand Down Expand Up @@ -273,10 +276,11 @@
},
"SSH.NET": {
"type": "Transitive",
"resolved": "2024.2.0",
"contentHash": "9r+4UF2P51lTztpd+H7SJywk7WgmlWB//Cm2o96c6uGVZU5r58ys2/cD9pCgTk0zCdSkfflWL1WtqQ9I4IVO9Q==",
"resolved": "2025.1.0",
"contentHash": "jrnbtf0ItVaXAe6jE8X/kSLa6uC+0C+7W1vepcnRQB/rD88qy4IxG7Lf1FIbWmkoc4iVXv0pKrz+Wc6J4ngmHw==",
"dependencies": {
"BouncyCastle.Cryptography": "2.4.0"
"BouncyCastle.Cryptography": "2.6.2",
"Microsoft.Extensions.Logging.Abstractions": "8.0.3"
}
},
"System.ClientModel": {
Expand Down Expand Up @@ -328,13 +332,13 @@
},
"Testcontainers": {
"type": "Transitive",
"resolved": "4.4.0",
"contentHash": "P4+fXNjMtLW1CRjBQ3SUQWxz98mio+79OL6B+4DmzMaafW1rEVZ/eFHFG9TrxMWeg+cgftkzV7oPcGNZQ12Q9w==",
"resolved": "4.10.0",
"contentHash": "a7tH+s9IRME6QEeMRgl/mTqQyudgtGNJmJRPn1+LwW8w/2L11cJzRJd7Io0QoSrP+i6lAOETX2SRY7cLbElcdQ==",
"dependencies": {
"Docker.DotNet.Enhanced": "3.126.1",
"Docker.DotNet.Enhanced.X509": "3.126.1",
"Docker.DotNet.Enhanced": "3.131.1",
"Docker.DotNet.Enhanced.X509": "3.131.1",
"Microsoft.Extensions.Logging.Abstractions": "8.0.3",
"SSH.NET": "2024.2.0",
"SSH.NET": "2025.1.0",
"SharpZipLib": "1.4.2"
}
},
Expand Down