Skip to content

Commit 35d98af

Browse files
SergerGoodSergerGood
committed
Support net7.0 and upgrade packages
1 parent bb49ae3 commit 35d98af

File tree

31 files changed

+111
-112
lines changed

31 files changed

+111
-112
lines changed

‎RepoDb.Benchmarks/RepoDb.Benchmarks.PostgreSql/Configurations/OrmNameConstants.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ public static class OrmNameConstants
44
{
55
public const string RepoDB = "RepoDB";
66

7-
public const string NHibernate = "NHibernate 5.4.0";
7+
public const string NHibernate = "NHibernate 5.4.6";
88

99
public const string EFCore = "EFCore 7.0.0";
1010

11-
public const string Dapper = "Dapper 2.0.123";
11+
public const string Dapper = "Dapper 2.1.21";
1212

13-
public const string Linq2db = "linq2db 4.3.0";
13+
public const string Linq2db = "linq2db 5.3.2";
1414
}
1515
}

‎RepoDb.Benchmarks/RepoDb.Benchmarks.PostgreSql/Linq2db/Linq2dbBaseBenchmarks.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Linq;
33
using BenchmarkDotNet.Attributes;
44
using DataModels;
5-
using LinqToDB.Configuration;
5+
using LinqToDB;
66
using RepoDb.Benchmarks.PostgreSql.Configurations;
77
using RepoDb.Benchmarks.PostgreSql.Setup;
88

@@ -23,10 +23,10 @@ protected override void Bootstrap()
2323

2424
protected static RepoDbDB GetDb()
2525
{
26-
var builder = new LinqToDBConnectionOptionsBuilder();
27-
builder.UsePostgreSQL(DatabaseHelper.ConnectionString);
26+
var options = new DataOptions();
27+
options = options.UsePostgreSQL(DatabaseHelper.ConnectionString);
2828

29-
return new RepoDbDB(builder.Build());
29+
return new RepoDbDB(options);
3030
}
3131
}
3232
}

‎RepoDb.Benchmarks/RepoDb.Benchmarks.PostgreSql/Models/PersonDatabase.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Linq;
33

44
using LinqToDB;
5-
using LinqToDB.Configuration;
65
using LinqToDB.Mapping;
76

87
namespace DataModels
@@ -28,7 +27,7 @@ public RepoDbDB(string configuration)
2827
InitMappingSchema();
2928
}
3029

31-
public RepoDbDB(LinqToDBConnectionOptions options)
30+
public RepoDbDB(DataOptions options)
3231
: base(options)
3332
{
3433
InitDataContext();

‎RepoDb.Benchmarks/RepoDb.Benchmarks.PostgreSql/RepoDb.Benchmarks.PostgreSql.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
10-
<PackageReference Include="Dapper" Version="2.0.123" />
9+
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
10+
<PackageReference Include="Dapper" Version="2.1.21" />
1111
<PackageReference Include="Dapper.Contrib" Version="2.0.78" />
12-
<PackageReference Include="linq2db" Version="4.3.0" />
13-
<PackageReference Include="linq2db.PostgreSQL" Version="4.3.0" />
12+
<PackageReference Include="linq2db" Version="5.3.2" />
13+
<PackageReference Include="linq2db.PostgreSQL" Version="5.3.2" />
1414
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
15-
<PackageReference Include="NHibernate" Version="5.4.0" />
16-
<PackageReference Include="Npgsql" Version="7.0.4" />
15+
<PackageReference Include="NHibernate" Version="5.4.6" />
16+
<PackageReference Include="Npgsql" Version="7.0.6" />
1717
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
1818
</ItemGroup>
1919

‎RepoDb.Benchmarks/RepoDb.Benchmarks.SqlServer/Configurations/OrmNameConstants.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ public static class OrmNameConstants
44
{
55
public const string RepoDB = "RepoDB";
66

7-
public const string NHibernate = "NHibernate 5.4.0";
7+
public const string NHibernate = "NHibernate 5.4.6";
88

99
public const string EFCore = "EFCore 7.0.0";
1010

11-
public const string Dapper = "Dapper 2.0.123";
11+
public const string Dapper = "Dapper 2.1.21";
1212
}
1313
}

‎RepoDb.Benchmarks/RepoDb.Benchmarks.SqlServer/RepoDb.Benchmarks.SqlServer.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
10-
<PackageReference Include="Dapper" Version="2.0.123" />
9+
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
10+
<PackageReference Include="Dapper" Version="2.1.21" />
1111
<PackageReference Include="Dapper.Contrib" Version="2.0.78" />
1212
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
1313
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
14-
<PackageReference Include="NHibernate" Version="5.4.0" />
14+
<PackageReference Include="NHibernate" Version="5.4.6" />
1515
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
1616
</ItemGroup>
1717

‎RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/RepoDb.IntegrationTests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

@@ -34,10 +34,10 @@
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
37+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
3838
<PackageReference Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
39-
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
40-
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
39+
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
40+
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
4141
</ItemGroup>
4242

4343
<ItemGroup>

‎RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/RepoDb.UnitTests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

@@ -17,10 +17,10 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
21-
<PackageReference Include="Moq" Version="4.18.4" />
22-
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
23-
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
21+
<PackageReference Include="Moq" Version="4.20.69" />
22+
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
23+
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
2424
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
2525
</ItemGroup>
2626

‎RepoDb.Core/RepoDb/RepoDb.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Title>RepoDB</Title>
5-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
66
<Version>0.0.1</Version>
77
<AssemblyVersion>0.0.1</AssemblyVersion>
88
<FileVersion>0.0.1</FileVersion>
@@ -35,7 +35,7 @@
3535

3636
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
3737
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
38-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
38+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
3939
<PackageReference Include="System.Memory" Version="4.5.5" />
4040
</ItemGroup>
4141

‎RepoDb.Extensions/RepoDb.PostgreSql.BulkOperations/RepoDb.PostgreSql.BulkOperations.IntegrationTests/RepoDb.PostgreSql.BulkOperations.IntegrationTests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

@@ -10,10 +10,10 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
14-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
15-
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
16-
<PackageReference Include="coverlet.collector" Version="3.1.2">
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
14+
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
15+
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
16+
<PackageReference Include="coverlet.collector" Version="6.0.0">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>

0 commit comments

Comments
 (0)