Skip to content

Commit f87da03

Browse files
jbogardjbogard
authored
Merge pull request #161 from jbogard/net10
Removing docker compose; .NET 10 tests
2 parents 4fe72e0 + 66af4c2 commit f87da03

8 files changed

Lines changed: 23 additions & 96 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ jobs:
1919
uses: actions/checkout@v2
2020
with:
2121
fetch-depth: 0
22-
- name: Setup dotnet 8.0
23-
uses: actions/setup-dotnet@v1
22+
- name: Setup dotnet
23+
uses: actions/setup-dotnet@v4
2424
with:
25-
dotnet-version: '8.0.x'
25+
dotnet-version: |
26+
8.0.x
27+
10.0.x
2628
- name: Build and Test
2729
run: ./Build.ps1
2830
shell: pwsh

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ jobs:
1616
uses: actions/checkout@v2
1717
with:
1818
fetch-depth: 0
19-
- name: Setup dotnet 8.0
20-
uses: actions/setup-dotnet@v1
19+
- name: Setup dotnet
20+
uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: '8.0.x'
22+
dotnet-version: |
23+
8.0.x
24+
10.0.x
2325
- name: Build and Test
2426
run: ./Build.ps1
2527
shell: pwsh

‎Respawn.DatabaseTests/EmptyDbTests.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
using System.Threading.Tasks;
22
using Microsoft.Data.SqlClient;
3-
using Respawn.Graph;
43
using Testcontainers.MsSql;
54
using Xunit;
65
using Xunit.Abstractions;
76

87
namespace Respawn.DatabaseTests
98
{
109
using System;
11-
using System.Linq;
1210
using NPoco;
1311
using Shouldly;
1412

‎Respawn.DatabaseTests/MySqlTests.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,5 @@ public async Task ShouldResetSequencesAndIdentities()
372372
_database.ExecuteScalar<int>("SELECT AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'MySqlTests' AND TABLE_NAME = 'a';").ShouldBe(1);
373373
}
374374

375-
public void Dispose()
376-
{
377-
_connection.Close();
378-
_connection.Dispose();
379-
}
380-
381375
}
382376
}

‎Respawn.DatabaseTests/PostgresTests.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public async Task DisposeAsync()
6868
await _sqlContainer.DisposeAsync();
6969
}
7070

71-
[SkipOnCI]
71+
[Fact]
7272
public async Task ShouldDeleteData()
7373
{
7474
await _database.ExecuteAsync("create table \"foo\" (value int)");
@@ -86,7 +86,7 @@ public async Task ShouldDeleteData()
8686
_database.ExecuteScalar<int>("SELECT COUNT(1) FROM \"foo\"").ShouldBe(0);
8787
}
8888

89-
[SkipOnCI]
89+
[Fact]
9090
public async Task ShouldIgnoreTables()
9191
{
9292
await _database.ExecuteAsync("create table foo (Value int)");
@@ -108,7 +108,7 @@ public async Task ShouldIgnoreTables()
108108
_database.ExecuteScalar<int>("SELECT COUNT(1) FROM bar").ShouldBe(0);
109109
}
110110

111-
[SkipOnCI]
111+
[Fact]
112112
public async Task ShouldIgnoreTablesIfSchemaSpecified()
113113
{
114114
await _database.ExecuteAsync("create schema eggs");
@@ -131,7 +131,7 @@ public async Task ShouldIgnoreTablesIfSchemaSpecified()
131131
_database.ExecuteScalar<int>("SELECT COUNT(1) FROM eggs.bar").ShouldBe(0);
132132
}
133133

134-
[SkipOnCI]
134+
[Fact]
135135
public async Task ShouldIncludeTables()
136136
{
137137
await _database.ExecuteAsync("create table foo (Value int)");
@@ -153,7 +153,7 @@ public async Task ShouldIncludeTables()
153153
_database.ExecuteScalar<int>("SELECT COUNT(1) FROM bar").ShouldBe(100);
154154
}
155155

156-
[SkipOnCI]
156+
[Fact]
157157
public async Task ShouldIncludeTablesIfSchemaSpecified()
158158
{
159159
await _database.ExecuteAsync("create schema eggs");
@@ -176,7 +176,7 @@ public async Task ShouldIncludeTablesIfSchemaSpecified()
176176
_database.ExecuteScalar<int>("SELECT COUNT(1) FROM eggs.bar").ShouldBe(100);
177177
}
178178

179-
[SkipOnCI]
179+
[Fact]
180180
public async Task ShouldHandleRelationships()
181181
{
182182
await _database.ExecuteAsync("create table foo (value int, primary key (value))");
@@ -209,7 +209,7 @@ public async Task ShouldHandleRelationships()
209209
_database.ExecuteScalar<int>("SELECT COUNT(1) FROM baz").ShouldBe(0);
210210
}
211211

212-
[SkipOnCI]
212+
[Fact]
213213
public async Task ShouldHandleCircularRelationships()
214214
{
215215
await _database.ExecuteAsync("create table parent (id int primary key, childid int NULL)");
@@ -244,7 +244,7 @@ public async Task ShouldHandleCircularRelationships()
244244
_database.ExecuteScalar<int>("SELECT COUNT(1) FROM child").ShouldBe(0);
245245
}
246246

247-
[SkipOnCI]
247+
[Fact]
248248
public async Task ShouldHandleSelfRelationships()
249249
{
250250
await _database.ExecuteAsync("create table foo (id int primary key, parentid int NULL)");
@@ -272,7 +272,7 @@ public async Task ShouldHandleSelfRelationships()
272272
_database.ExecuteScalar<int>("SELECT COUNT(1) FROM foo").ShouldBe(0);
273273
}
274274

275-
[SkipOnCI]
275+
[Fact]
276276
public async Task ShouldHandleComplexCycles()
277277
{
278278
await _database.ExecuteAsync("create table a (id int primary key, b_id int NULL)");
@@ -326,7 +326,7 @@ public async Task ShouldHandleComplexCycles()
326326
}
327327

328328

329-
[SkipOnCI]
329+
[Fact]
330330
public async Task ShouldExcludeSchemas()
331331
{
332332
await _database.ExecuteAsync("create schema a");
@@ -350,7 +350,7 @@ public async Task ShouldExcludeSchemas()
350350
_database.ExecuteScalar<int>("SELECT COUNT(1) FROM b.bar").ShouldBe(0);
351351
}
352352

353-
[SkipOnCI]
353+
[Fact]
354354
public async Task ShouldIncludeSchemas()
355355
{
356356
await _database.ExecuteAsync("create schema a");
@@ -374,7 +374,7 @@ public async Task ShouldIncludeSchemas()
374374
_database.ExecuteScalar<int>("SELECT COUNT(1) FROM b.bar").ShouldBe(0);
375375
}
376376

377-
[SkipOnCI]
377+
[Fact]
378378
public async Task ShouldResetSequencesAndIdentities()
379379
{
380380
await _database.ExecuteAsync("CREATE TABLE a (id INT GENERATED ALWAYS AS IDENTITY, value SERIAL)");

‎Respawn.DatabaseTests/Respawn.DatabaseTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
55
<NoWarn>$(NoWarn);NU1902;NU1903;NU1904</NoWarn>
66
</PropertyGroup>
77
<ItemGroup>

‎Respawn.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
Build.ps1 = Build.ps1
1414
.github\workflows\ci.yml = .github\workflows\ci.yml
1515
Directory.Build.props = Directory.Build.props
16-
docker-compose.yml = docker-compose.yml
1716
informix-server\my_post.sh = informix-server\my_post.sh
1817
informix-server\onconfig = informix-server\onconfig
1918
Push.ps1 = Push.ps1

‎docker-compose.yml‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)