Skip to content

Commit 6cfae03

Browse files
Copilotdependabot[bot]JerrettDavis
authored
Fix Testcontainers.MsSql 4.10.0 breaking changes (#92)
* deps: Bump Testcontainers.MsSql from 4.4.0 to 4.10.0 --- updated-dependencies: - dependency-name: Testcontainers.MsSql dependency-version: 4.10.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Testcontainers.MsSql dependency-version: 4.10.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Initial plan * Fix Testcontainers obsolete constructors to use new API Co-authored-by: JerrettDavis <2610199+JerrettDavis@users.noreply.github.com> * Update Testcontainers.MsSql to 4.10.0 in Sdk.IntegrationTests Co-authored-by: JerrettDavis <2610199+JerrettDavis@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: JerrettDavis <2610199+JerrettDavis@users.noreply.github.com> Co-authored-by: JD Davis <mxjerrett@gmail.com>
1 parent 83e401f commit 6cfae03

9 files changed

Lines changed: 2717 additions & 161 deletions

File tree

‎src/JD.Efcpt.Build.Tasks/packages.lock.json‎

Lines changed: 1707 additions & 69 deletions
Large diffs are not rendered by default.

‎src/JD.Efcpt.Build/packages.lock.json‎

Lines changed: 978 additions & 56 deletions
Large diffs are not rendered by default.

‎tests/JD.Efcpt.Build.Tests/Integration/EndToEndReverseEngineeringTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ private sealed record SchemaGenerationResult(
3737

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

4443
await container.StartAsync();

‎tests/JD.Efcpt.Build.Tests/Integration/QuerySchemaMetadataIntegrationTests.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ await Given("invalid connection string", SetupInvalidConnectionString)
110110

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

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

129128
private static async Task<TestContext> SetupComprehensiveSchema()
130129
{
131-
var container = new MsSqlBuilder()
132-
.WithImage("mcr.microsoft.com/mssql/server:2022-latest")
130+
var container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-latest")
133131
.Build();
134132

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

147145
private static async Task<TestContext> SetupEmptyDatabase()
148146
{
149-
var container = new MsSqlBuilder()
150-
.WithImage("mcr.microsoft.com/mssql/server:2022-latest")
147+
var container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-latest")
151148
.Build();
152149

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

165162
private static Task<TestContext> SetupInvalidConnectionString()
166163
{
167-
var container = new MsSqlBuilder()
168-
.WithImage("mcr.microsoft.com/mssql/server:2022-latest")
164+
var container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-latest")
169165
.Build();
170166

171167
// Don't start the container - connection will fail

‎tests/JD.Efcpt.Build.Tests/Integration/SnowflakeSchemaIntegrationTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ private sealed record FingerprintResult(TestContext Context, string Fingerprint1
5656
private static async Task<TestContext> SetupEmptyDatabase()
5757
{
5858
// LocalStack Snowflake uses port 4566 and requires auth token
59-
var container = new ContainerBuilder()
60-
.WithImage("localstack/snowflake:latest")
59+
var container = new ContainerBuilder("localstack/snowflake:latest")
6160
.WithPortBinding(4566, true)
6261
.WithEnvironment("LOCALSTACK_AUTH_TOKEN", LocalStackAuthToken!)
6362
.WithEnvironment("SF_DEFAULT_USER", "test")

‎tests/JD.Efcpt.Build.Tests/Integration/SqlServerSchemaIntegrationTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ private sealed record SchemaResult(
3232

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

3938
await container.StartAsync();

‎tests/JD.Efcpt.Sdk.IntegrationTests/JD.Efcpt.Sdk.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
2121
<PackageReference Include="FluentAssertions" Version="8.8.0" />
22-
<PackageReference Include="Testcontainers.MsSql" Version="4.4.0" />
22+
<PackageReference Include="Testcontainers.MsSql" Version="4.10.0" />
2323
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
2424
</ItemGroup>
2525

‎tests/JD.Efcpt.Sdk.IntegrationTests/SqlGenerationIntegrationTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public async ValueTask DisposeAsync()
3939

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

4645
await _container.StartAsync();

‎tests/JD.Efcpt.Sdk.IntegrationTests/packages.lock.json‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
},
4646
"Testcontainers.MsSql": {
4747
"type": "Direct",
48-
"requested": "[4.4.0, )",
49-
"resolved": "4.4.0",
50-
"contentHash": "Ghh7rK17G7Lf6fhmfnen2Jo3X6x3xrXaiakeR4KkR1bHFACeYSlbBvQhuAz1Vx+aVkcCzoLpbxexVwqnQocvcw==",
48+
"requested": "[4.10.0, )",
49+
"resolved": "4.10.0",
50+
"contentHash": "2FnZFymCGNBB/bP38C8dFpFZjI7JSp1P8sVsoejEPd56NPDIc6CSZHnIJ6eu9arAbTyJ7+pGAbVyZ6notq/tVw==",
5151
"dependencies": {
52-
"Testcontainers": "4.4.0"
52+
"Testcontainers": "4.10.0"
5353
}
5454
},
5555
"xunit": {
@@ -101,20 +101,23 @@
101101
},
102102
"BouncyCastle.Cryptography": {
103103
"type": "Transitive",
104-
"resolved": "2.4.0",
105-
"contentHash": "SwXsAV3sMvAU/Nn31pbjhWurYSjJ+/giI/0n6tCrYoupEK34iIHCuk3STAd9fx8yudM85KkLSVdn951vTng/vQ=="
104+
"resolved": "2.6.2",
105+
"contentHash": "7oWOcvnntmMKNzDLsdxAYqApt+AjpRpP2CShjMfIa3umZ42UQMvH0tl1qAliYPNYO6vTdcGMqnRrCPmsfzTI1w=="
106106
},
107107
"Docker.DotNet.Enhanced": {
108108
"type": "Transitive",
109-
"resolved": "3.126.1",
110-
"contentHash": "UPyLBLBaVE3s7OCWM0h5g9w6mUOag5sOIP5CldFQekIWo/gHixgZR+o5fG7eCFH4ZdKlvBGM4ALFuOyPoKoJ3A=="
109+
"resolved": "3.131.1",
110+
"contentHash": "hGLHCNUsQbT2Ab/HUznRnNqYZQs40zInXa3eLwYjeNyfUYbw1pqqDGqcOLl5uGepS8IuigEYakEdAcVT/2ezYg==",
111+
"dependencies": {
112+
"Microsoft.Extensions.Logging.Abstractions": "8.0.3"
113+
}
111114
},
112115
"Docker.DotNet.Enhanced.X509": {
113116
"type": "Transitive",
114-
"resolved": "3.126.1",
115-
"contentHash": "XFHMC/iWHbloQgg9apZrxu010DmSamaAggu8nomCqTeotGyUGkv2Tt/aqk1ljC/4tjtTrb9LtFQwYpwZbMbiKg==",
117+
"resolved": "3.131.1",
118+
"contentHash": "8FU7zmttFQzp0xb0EPupxQ0nGtC2cTpukgh3jMxMT8luj5TSDyzIKTnroDpXCjpg9P2fV+6JIvC+IetsMEfyBA==",
116119
"dependencies": {
117-
"Docker.DotNet.Enhanced": "3.126.1"
120+
"Docker.DotNet.Enhanced": "3.131.1"
118121
}
119122
},
120123
"Microsoft.Bcl.AsyncInterfaces": {
@@ -273,10 +276,11 @@
273276
},
274277
"SSH.NET": {
275278
"type": "Transitive",
276-
"resolved": "2024.2.0",
277-
"contentHash": "9r+4UF2P51lTztpd+H7SJywk7WgmlWB//Cm2o96c6uGVZU5r58ys2/cD9pCgTk0zCdSkfflWL1WtqQ9I4IVO9Q==",
279+
"resolved": "2025.1.0",
280+
"contentHash": "jrnbtf0ItVaXAe6jE8X/kSLa6uC+0C+7W1vepcnRQB/rD88qy4IxG7Lf1FIbWmkoc4iVXv0pKrz+Wc6J4ngmHw==",
278281
"dependencies": {
279-
"BouncyCastle.Cryptography": "2.4.0"
282+
"BouncyCastle.Cryptography": "2.6.2",
283+
"Microsoft.Extensions.Logging.Abstractions": "8.0.3"
280284
}
281285
},
282286
"System.ClientModel": {
@@ -328,13 +332,13 @@
328332
},
329333
"Testcontainers": {
330334
"type": "Transitive",
331-
"resolved": "4.4.0",
332-
"contentHash": "P4+fXNjMtLW1CRjBQ3SUQWxz98mio+79OL6B+4DmzMaafW1rEVZ/eFHFG9TrxMWeg+cgftkzV7oPcGNZQ12Q9w==",
335+
"resolved": "4.10.0",
336+
"contentHash": "a7tH+s9IRME6QEeMRgl/mTqQyudgtGNJmJRPn1+LwW8w/2L11cJzRJd7Io0QoSrP+i6lAOETX2SRY7cLbElcdQ==",
333337
"dependencies": {
334-
"Docker.DotNet.Enhanced": "3.126.1",
335-
"Docker.DotNet.Enhanced.X509": "3.126.1",
338+
"Docker.DotNet.Enhanced": "3.131.1",
339+
"Docker.DotNet.Enhanced.X509": "3.131.1",
336340
"Microsoft.Extensions.Logging.Abstractions": "8.0.3",
337-
"SSH.NET": "2024.2.0",
341+
"SSH.NET": "2025.1.0",
338342
"SharpZipLib": "1.4.2"
339343
}
340344
},

0 commit comments

Comments
 (0)