Skip to content

Commit 13a320a

Browse files
JonPSmithJonPSmith
authored
Merge pull request #54 from chrisbbe/dotnet_7_support
Dotnet 7 support
2 parents 8735d4d + fe6adb7 commit 13a320a

File tree

5 files changed

+66
-22
lines changed

5 files changed

+66
-22
lines changed

‎BenchmarkPostgreSql/BenchmarkPostgreSql.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
12-
<PackageReference Include="BenchmarkDotNet.Annotations" Version="0.13.1" />
13-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
11+
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
12+
<PackageReference Include="BenchmarkDotNet.Annotations" Version="0.13.2" />
13+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎DataLayer/DataLayer.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
8-
<PackageReference Include="GenericServices.StatusGeneric" Version="1.1.0" />
8+
<PackageReference Include="GenericServices.StatusGeneric" Version="1.2.0" />
99
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
1010
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
1111
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10" />
12-
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
12+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1313
</ItemGroup>
1414

1515
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
16-
<PackageReference Include="GenericServices.StatusGeneric" Version="1.1.0" />
16+
<PackageReference Include="GenericServices.StatusGeneric" Version="1.2.0" />
1717
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
1919
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" />
20-
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
20+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
21+
</ItemGroup>
22+
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
24+
<PackageReference Include="GenericServices.StatusGeneric" Version="1.2.0" />
25+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0" />
28+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2129
</ItemGroup>
2230

2331
</Project>

‎Test/Test.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
88
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.10" />
99
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
1010
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
1111
<PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
13-
<PackageReference Include="xunit" Version="2.4.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
13+
<PackageReference Include="xunit" Version="2.4.2" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>
@@ -22,14 +22,26 @@
2222
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
2323
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
2424
<PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
26-
<PackageReference Include="xunit" Version="2.4.1" />
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
26+
<PackageReference Include="xunit" Version="2.4.2" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
</PackageReference>
3131
</ItemGroup>
3232

33+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
34+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
36+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
37+
<PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
38+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
39+
<PackageReference Include="xunit" Version="2.4.2" />
40+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
41+
<PrivateAssets>all</PrivateAssets>
42+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
43+
</PackageReference>
44+
</ItemGroup>
3345

3446
<ItemGroup>
3547
<ProjectReference Include="..\DataLayer\DataLayer.csproj" />

‎TestSupport/EfHelpers/Internal/NpgsqlDatabaseCleaner.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,19 @@ NOT EXISTS (
159159

160160
private void DropCollations(NpgsqlConnection conn)
161161
{
162-
#if NET6_0_OR_GREATER
162+
#if NET6_0
163163
if (conn.Settings.ServerCompatibilityMode == ServerCompatibilityMode.Redshift)
164164
{
165165
return;
166166
}
167167
#endif
168168

169+
#if NET7_0_OR_GREATER
170+
var connectionStringBuilder = new NpgsqlConnectionStringBuilder(conn.ConnectionString);
171+
if (connectionStringBuilder.ServerCompatibilityMode == ServerCompatibilityMode.Redshift) return;
172+
#endif
173+
174+
169175
const string getUserCollations = @"SELECT nspname, collname
170176
FROM pg_collation coll
171177
JOIN pg_namespace ns ON ns.oid=coll.collnamespace

‎TestSupport/TestSupport.csproj‎

Lines changed: 23 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>netstandard2.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
</PropertyGroup>
77

@@ -19,8 +19,8 @@
1919
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.1" />
2020
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
2121
<PackageReference Include="Respawn" Version="4.0.0" />
22-
<PackageReference Include="xunit.assert" Version="2.4.1" />
23-
<PackageReference Include="xunit.core" Version="2.4.1" />
22+
<PackageReference Include="xunit.assert" Version="2.4.2" />
23+
<PackageReference Include="xunit.core" Version="2.4.2" />
2424
</ItemGroup>
2525

2626
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
@@ -37,10 +37,28 @@
3737
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.1" />
3838
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
3939
<PackageReference Include="Respawn" Version="4.0.0" />
40-
<PackageReference Include="xunit.assert" Version="2.4.1" />
41-
<PackageReference Include="xunit.core" Version="2.4.1" />
40+
<PackageReference Include="xunit.assert" Version="2.4.2" />
41+
<PackageReference Include="xunit.core" Version="2.4.2" />
4242
</ItemGroup>
4343

44+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
45+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
46+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0" />
47+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
48+
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="7.0.0">
49+
<PrivateAssets>all</PrivateAssets>
50+
</PackageReference>
51+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
52+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
53+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
54+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
55+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" />
56+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
57+
<PackageReference Include="Respawn" Version="4.0.0" />
58+
<PackageReference Include="xunit.assert" Version="2.4.2" />
59+
<PackageReference Include="xunit.core" Version="2.4.2" />
60+
</ItemGroup>
61+
4462
<PropertyGroup>
4563
<PackageId>EfCore.TestSupport</PackageId>
4664
<PackageVersion>5.2.2</PackageVersion>

0 commit comments

Comments
 (0)