Skip to content

Commit 0f45722

Browse files
Merge pull request #238 from MisterZeus/update-nuget-again
Update nuget again
2 parents a1a740e + 84de71d commit 0f45722

3 files changed

Lines changed: 19 additions & 14 deletions

File tree

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ A clear description of the change and why it's being made.
55
## Which component(s) does this affect?
66

77
- [ ] Full Dashboard
8-
- [ ] Lite
8+
- [ ] Lite Dashboard
9+
- [ ] Lite Tests
910
- [ ] SQL collection scripts
10-
- [ ] Installer
11+
- [ ] CLI Installer
12+
- [ ] GUI Installer
1113
- [ ] Documentation
1214

1315
## How was this tested?

Lite.Tests/DuckDbSchemaTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ public async Task InitializeAsync_CreatesAllTables()
7272
};
7373

7474
using var connection = new DuckDBConnection($"Data Source={_dbPath}");
75-
await connection.OpenAsync();
75+
await connection.OpenAsync(TestContext.Current.CancellationToken);
7676

7777
foreach (var table in expectedTables)
7878
{
7979
using var cmd = connection.CreateCommand();
8080
cmd.CommandText = $"SELECT COUNT(*) FROM information_schema.tables WHERE table_name = '{table}'";
81-
var count = Convert.ToInt32(await cmd.ExecuteScalarAsync());
81+
var count = Convert.ToInt32(await cmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
8282
Assert.True(count == 1, $"Table '{table}' should exist but was not found");
8383
}
8484
}
@@ -90,11 +90,11 @@ public async Task InitializeAsync_SetsCorrectSchemaVersion()
9090
await initializer.InitializeAsync();
9191

9292
using var connection = new DuckDBConnection($"Data Source={_dbPath}");
93-
await connection.OpenAsync();
93+
await connection.OpenAsync(TestContext.Current.CancellationToken);
9494

9595
using var cmd = connection.CreateCommand();
9696
cmd.CommandText = "SELECT MAX(version) FROM schema_version";
97-
var version = Convert.ToInt32(await cmd.ExecuteScalarAsync());
97+
var version = Convert.ToInt32(await cmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
9898

9999
Assert.Equal(DuckDbInitializer.CurrentSchemaVersion, version);
100100
}
@@ -109,11 +109,11 @@ public async Task InitializeAsync_IsIdempotent()
109109
await initializer.InitializeAsync();
110110

111111
using var connection = new DuckDBConnection($"Data Source={_dbPath}");
112-
await connection.OpenAsync();
112+
await connection.OpenAsync(TestContext.Current.CancellationToken);
113113

114114
using var cmd = connection.CreateCommand();
115115
cmd.CommandText = "SELECT MAX(version) FROM schema_version";
116-
var version = Convert.ToInt32(await cmd.ExecuteScalarAsync());
116+
var version = Convert.ToInt32(await cmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
117117

118118
Assert.Equal(DuckDbInitializer.CurrentSchemaVersion, version);
119119
}
@@ -147,12 +147,12 @@ public async Task InitializeAsync_CreatesIndexes()
147147
await initializer.InitializeAsync();
148148

149149
using var connection = new DuckDBConnection($"Data Source={_dbPath}");
150-
await connection.OpenAsync();
150+
await connection.OpenAsync(TestContext.Current.CancellationToken);
151151

152152
/* Verify at least some indexes exist by checking duckdb_indexes */
153153
using var cmd = connection.CreateCommand();
154154
cmd.CommandText = "SELECT COUNT(*) FROM duckdb_indexes()";
155-
var indexCount = Convert.ToInt32(await cmd.ExecuteScalarAsync());
155+
var indexCount = Convert.ToInt32(await cmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
156156

157157
/* We create 18 indexes */
158158
Assert.True(indexCount >= 18, $"Expected >= 18 indexes, found {indexCount}");

Lite.Tests/Lite.Tests.csproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net8.0-windows</TargetFramework>
44
<Nullable>enable</Nullable>
@@ -9,9 +9,12 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
13-
<PackageReference Include="xunit" Version="2.8.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
17+
<PackageReference Include="xunit.v3" Version="3.2.2" />
1518
</ItemGroup>
1619

1720
<ItemGroup>

0 commit comments

Comments
 (0)