From 35548edd9534de452902db4911164350aed57612 Mon Sep 17 00:00:00 2001 From: Henk Mollema Date: Wed, 15 Nov 2023 09:45:56 +0100 Subject: [PATCH] Update NuGet packages and target .NET 8 in test projects --- Directory.Build.props | 2 +- src/Dommel.Json/Dommel.Json.csproj | 2 +- src/Dommel/Dommel.csproj | 2 +- src/Dommel/DommelMapper.cs | 2 +- src/Dommel/Insert.cs | 4 ++-- .../Dommel.IntegrationTests.csproj | 14 +++++++------- .../Dommel.Json.IntegrationTests.csproj | 10 +++++----- test/Dommel.Json.Tests/Dommel.Json.Tests.csproj | 10 +++++----- test/Dommel.Tests/Dommel.Tests.csproj | 8 ++++---- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 39fa82a..0a919e9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ Copyright © Henk Mollema 2014 - 3.1.0 + 3.2.0 Henk Mollema latest enable diff --git a/src/Dommel.Json/Dommel.Json.csproj b/src/Dommel.Json/Dommel.Json.csproj index f144074..e5f7cea 100644 --- a/src/Dommel.Json/Dommel.Json.csproj +++ b/src/Dommel.Json/Dommel.Json.csproj @@ -7,6 +7,6 @@ - + diff --git a/src/Dommel/Dommel.csproj b/src/Dommel/Dommel.csproj index 67e05f5..dbd4f10 100644 --- a/src/Dommel/Dommel.csproj +++ b/src/Dommel/Dommel.csproj @@ -6,7 +6,7 @@ true - + diff --git a/src/Dommel/DommelMapper.cs b/src/Dommel/DommelMapper.cs index 0e4fdb3..ab60016 100644 --- a/src/Dommel/DommelMapper.cs +++ b/src/Dommel/DommelMapper.cs @@ -48,7 +48,7 @@ static DommelMapper() return property; } } - return DefaultTypeMapProvider(type)?.GetMember(columnName)?.Property; + return DefaultTypeMapProvider(type)?.GetMember(columnName)?.Property!; }); #if NET6_0_OR_GREATER diff --git a/src/Dommel/Insert.cs b/src/Dommel/Insert.cs index cb05aa5..ff2e1a9 100644 --- a/src/Dommel/Insert.cs +++ b/src/Dommel/Insert.cs @@ -23,7 +23,7 @@ public static object Insert(this IDbConnection connection, TEntity enti { var sql = BuildInsertQuery(GetSqlBuilder(connection), typeof(TEntity)); LogQuery(sql); - return connection.ExecuteScalar(sql, entity, transaction); + return connection.ExecuteScalar(sql, entity, transaction)!; } /// @@ -40,7 +40,7 @@ public static Task InsertAsync(this IDbConnection connection, T { var sql = BuildInsertQuery(GetSqlBuilder(connection), typeof(TEntity)); LogQuery(sql); - return connection.ExecuteScalarAsync(new CommandDefinition(sql, entity, transaction: transaction, cancellationToken: cancellationToken)); + return connection.ExecuteScalarAsync(new CommandDefinition(sql, entity, transaction: transaction, cancellationToken: cancellationToken))!; } /// diff --git a/test/Dommel.IntegrationTests/Dommel.IntegrationTests.csproj b/test/Dommel.IntegrationTests/Dommel.IntegrationTests.csproj index 219a26f..ca5c968 100644 --- a/test/Dommel.IntegrationTests/Dommel.IntegrationTests.csproj +++ b/test/Dommel.IntegrationTests/Dommel.IntegrationTests.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 false @@ -8,12 +8,12 @@ runtime; build; native; contentfiles; analyzers - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Dommel.Json.IntegrationTests/Dommel.Json.IntegrationTests.csproj b/test/Dommel.Json.IntegrationTests/Dommel.Json.IntegrationTests.csproj index 3d050ac..455ef67 100644 --- a/test/Dommel.Json.IntegrationTests/Dommel.Json.IntegrationTests.csproj +++ b/test/Dommel.Json.IntegrationTests/Dommel.Json.IntegrationTests.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 false @@ -9,10 +9,10 @@ runtime; build; native; contentfiles; analyzers - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Dommel.Json.Tests/Dommel.Json.Tests.csproj b/test/Dommel.Json.Tests/Dommel.Json.Tests.csproj index 69e2822..0a75df2 100644 --- a/test/Dommel.Json.Tests/Dommel.Json.Tests.csproj +++ b/test/Dommel.Json.Tests/Dommel.Json.Tests.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 false @@ -8,10 +8,10 @@ runtime; build; native; contentfiles; analyzers - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Dommel.Tests/Dommel.Tests.csproj b/test/Dommel.Tests/Dommel.Tests.csproj index 51a1979..c82a0f7 100644 --- a/test/Dommel.Tests/Dommel.Tests.csproj +++ b/test/Dommel.Tests/Dommel.Tests.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 false @@ -8,9 +8,9 @@ runtime; build; native; contentfiles; analyzers - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive