Skip to content

Commit 20cf3d1

Browse files
JonPSmithJonPSmith
committed
Updating to .NET 8
1 parent 4dfe406 commit 20cf3d1

8 files changed

Lines changed: 52 additions & 122 deletions

File tree

‎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>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
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" />
11+
<PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
12+
<PackageReference Include="BenchmarkDotNet.Annotations" Version="0.13.8" />
13+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.1" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎DataLayer/DataLayer.csproj‎

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

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

7-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
7+
<ItemGroup>
88
<PackageReference Include="GenericServices.StatusGeneric" Version="1.2.0" />
9-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10" />
12-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
9+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.1" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.1.23419.6" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.1.23419.6" />
12+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1313
</ItemGroup>
1414

15-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
16-
<PackageReference Include="GenericServices.StatusGeneric" Version="1.2.0" />
17-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" />
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" />
29-
</ItemGroup>
3015

3116
</Project>

‎README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ This NuGet package containing methods to help test applications that use [Entity
44

55
The EfCore.TestSupport library is available on [NuGet as EfCore.TestSupport](https://www.nuget.org/packages/EfCore.TestSupport/) and is an open-source library under the MIT license. See [ReleaseNotes](https://github.com/JonPSmith/EfCore.TestSupport/blob/master/ReleaseNotes.md) for details of the changes in each vesion.
66

7-
_NOTE: Version 5.1.0 and above of this library supports multiple versions of EF Core 5._
87

9-
- _Version 5.1.0 and above supports EF Core 5.10 and EF Core 6.0_
10-
- _Version 5.2.0 and above supports EF Core 5.10, EF Core 6.0 and EF Core 7.0_
8+
## List of versions and which .NET framwork they support
119

12-
**WARNING: If you are updating from the original EfCore.TestSupport (2.1 or 3), then you should read the [Version5UpgradeDocs.md](https://github.com/JonPSmith/EfCore.TestSupport/blob/master/Version5UpgradeDocs.md) file as there are some breaking changes in this version.**
10+
- Version 6.0.?: Supports NET 7 and 8
11+
- Version 5.2.0: Supports NET 5, 6 and 7
12+
- Version 5.1.0: Supports NET 5, 6
13+
14+
_There are older versions of the EfCore.TestSupport library, but .NET lower than .NET 5 are not supported by Microsoft._
1315

1416
## Documentation
1517

‎ReleaseNotes.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# Release notes
22

3+
## 6.0.0
4+
5+
- Updated to support NET 7 and NET 8
6+
37
## 5.3.0
48

59
- Updated to support NET 7 - thanks to GitHub user @chrisbbe - see PR #54
6-
- Updated LogOutpur.DecodeMessage to handle errors - see issue #49
10+
- Updated LogOutput.DecodeMessage to handle errors - see issue #49
711

812
## 5.2.2
913

‎Test/Test.csproj‎

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

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

7-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
8-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.10" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
7+
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0-rc.1.23419.6" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.1.23419.6" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.1.23419.6" />
1112
<PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
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">
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
14+
<PackageReference Include="xunit" Version="2.5.0" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
1516
<PrivateAssets>all</PrivateAssets>
1617
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1718
</PackageReference>
1819
</ItemGroup>
1920

20-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
22-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
24-
<PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
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">
28-
<PrivateAssets>all</PrivateAssets>
29-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
30-
</PackageReference>
31-
</ItemGroup>
32-
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>
45-
4621
<ItemGroup>
4722
<ProjectReference Include="..\DataLayer\DataLayer.csproj" />
4823
<ProjectReference Include="..\TestSupport\TestSupport.csproj" />

‎TestFromSqlRaw/TestFromSqlRaw.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

‎TestSupport/EfHelpers/PostgreSqlHelpers.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
using Microsoft.EntityFrameworkCore;
88
using Npgsql;
99
using Respawn;
10-
using TestSupport.EfHelpers;
1110
using TestSupport.EfHelpers.Internal;
1211
using TestSupport.Helpers;
1312

14-
namespace Test.Helpers
13+
namespace TestSupport.EfHelpers
1514
{
1615
/// <summary>
1716
/// This static class contains extension methods to use with PostgreSql databases
@@ -89,6 +88,7 @@ public static DbContextOptions<T> CreatePostgreSqlUniqueMethodOptions<T>(this ob
8988
public async static Task EnsureCreatedAndEmptyPostgreSqlAsync<T>(this T context, bool thereIsAnExistingDatabase = false)
9089
where T : DbContext
9190
{
91+
//see https://github.com/dotnet/efcore/issues/26541 for the solution
9292
Checkpoint EmptyCheckpoint = new Checkpoint
9393
{
9494
DbAdapter = DbAdapter.Postgres

‎TestSupport/TestSupport.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
</PropertyGroup>
77

8-
9-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.10" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="5.0.10">
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0-rc.1.23419.6" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.1.23419.6" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0-rc.1.23419.6" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="8.0.0-rc.1.23419.6">
1313
<PrivateAssets>all</PrivateAssets>
1414
</PackageReference>
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
19-
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.1" />
20-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
21-
<PackageReference Include="Respawn" Version="4.0.0" />
22-
<PackageReference Include="xunit.assert" Version="2.4.2" />
23-
<PackageReference Include="xunit.core" Version="2.4.2" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.1.23419.6" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.1.23419.6" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0-rc.1.23419.4" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.1.23419.4" />
19+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
20+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.1" />
21+
<PackageReference Include="Respawn" Version="6.1.0 " />
22+
<PackageReference Include="xunit.assert" Version="2.5.0" />
23+
<PackageReference Include="xunit.core" Version="2.5.0" />
2424
</ItemGroup>
25-
26-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
27-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0" />
29-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="6.0.0">
31-
<PrivateAssets>all</PrivateAssets>
32-
</PackageReference>
33-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
34-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
35-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
36-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
37-
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.1" />
38-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
39-
<PackageReference Include="Respawn" Version="4.0.0" />
40-
<PackageReference Include="xunit.assert" Version="2.4.2" />
41-
<PackageReference Include="xunit.core" Version="2.4.2" />
42-
</ItemGroup>
43-
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>
6125

6226
<PropertyGroup>
6327
<PackageId>EfCore.TestSupport</PackageId>
64-
<PackageVersion>5.3.0</PackageVersion>
65-
<Version>5.3.0</Version>
66-
<AssemblyVersion>5.3.0.0</AssemblyVersion>
67-
<FileVersion>5.3.0.0</FileVersion>
28+
<PackageVersion>8.0.0</PackageVersion>
29+
<Version>8.0.0</Version>
30+
<AssemblyVersion>8.0.0.0</AssemblyVersion>
31+
<FileVersion>8.0.0.0</FileVersion>
6832
<Authors>Jon P Smith</Authors>
6933
<Description>Useful tools when unit testing applications that use Entity Framework Core. See readme file on github.</Description>
7034
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

0 commit comments

Comments
 (0)