Skip to content

Commit 7513e86

Browse files
JonPSmithJonPSmith
committed
6.0.0-rc2-0002 - now supports NET 6, 7, and 8
1 parent 1e92905 commit 7513e86

File tree

6 files changed

+117
-29
lines changed

6 files changed

+117
-29
lines changed

‎BenchmarkPostgreSql/BenchmarkPostgreSql.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
1212
<PackageReference Include="BenchmarkDotNet.Annotations" Version="0.13.8" />
13-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.1" />
13+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.2" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎DataLayer/DataLayer.csproj‎

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

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

7-
<ItemGroup>
7+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0'">
88
<PackageReference Include="GenericServices.StatusGeneric" Version="1.2.0" />
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" />
9+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.2" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.2.23480.1" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.2.23480.1" />
1212
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1313
</ItemGroup>
1414

15+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
16+
<PackageReference Include="GenericServices.StatusGeneric" Version="1.2.0" />
17+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0" />
20+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
21+
</ItemGroup>
22+
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
24+
<PackageReference Include="GenericServices.StatusGeneric" Version="1.2.0" />
25+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" />
28+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
29+
</ItemGroup>
30+
1531

1632
</Project>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The EfCore.TestSupport library is available on [NuGet as EfCore.TestSupport](htt
99

1010
The versions of this library has changed to make it easier to create a new version when a new release of .NET farmework. Now the first number defines the .NET version, e.g EfCore.TestSupport version 8.?.? only runs on .NET 8.
1111

12-
- Version 8.?.?: Supports NET 8
12+
- Version 6.?.?: Supports NET 6, 7 and 8
1313
- Version 5.2.?: Supports NET 5, 6 and 7
1414

1515
_There are older versions of the EfCore.TestSupport library, but .NET lower than .NET 5 are not supported by Microsoft._

‎ReleaseNotes.md‎

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

3+
## 8.0.0-rc2-0002
4+
5+
- New version to support NET 8 rc2 - now supports NET 6, 7, and 8
6+
7+
## 8.0.0-rc2-0001
8+
9+
- First build using NET 8-rc2
10+
311
## 8.0.0-rc1-0001
412

513
- First build using NET 8-rc1

‎Test/Test.csproj‎

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

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

77

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" />
8+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0'">
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0-rc.2.23480.1" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.2.23480.1" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.2.23480.1" />
1212
<PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
1414
<PackageReference Include="xunit" Version="2.5.0" />
@@ -18,7 +18,35 @@
1818
</PackageReference>
1919
</ItemGroup>
2020

21-
<ItemGroup>
21+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
22+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
23+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
25+
<PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
27+
<PackageReference Include="xunit" Version="2.4.2" />
28+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
29+
<PrivateAssets>all</PrivateAssets>
30+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
31+
</PackageReference>
32+
</ItemGroup>
33+
34+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
36+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
37+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
38+
<PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
39+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
40+
<PackageReference Include="xunit" Version="2.4.2" />
41+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
42+
<PrivateAssets>all</PrivateAssets>
43+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
44+
</PackageReference>
45+
</ItemGroup>
46+
47+
48+
49+
<ItemGroup>
2250
<ProjectReference Include="..\DataLayer\DataLayer.csproj" />
2351
<ProjectReference Include="..\TestSupport\TestSupport.csproj" />
2452
</ItemGroup>

‎TestSupport/TestSupport.csproj‎

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

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

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">
8+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0'">
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0-rc.2.23480.1" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.2.23480.1" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0-rc.2.23480.1" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="8.0.0-rc.2.23480.1">
1313
<PrivateAssets>all</PrivateAssets>
1414
</PackageReference>
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" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.2.23480.1" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.2.23480.1" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0-rc.2.23479.6" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.2.23479.6" />
1919
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
20-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.1" />
20+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.2" />
2121
<PackageReference Include="xunit.assert" Version="2.5.0" />
2222
<PackageReference Include="xunit.core" Version="2.5.0" />
2323
</ItemGroup>
2424

25+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
26+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="7.0.0">
30+
<PrivateAssets>all</PrivateAssets>
31+
</PackageReference>
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
33+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
36+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" />
37+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
38+
<PackageReference Include="Respawn" Version="4.0.0" />
39+
<PackageReference Include="xunit.assert" Version="2.4.2" />
40+
<PackageReference Include="xunit.core" Version="2.4.2" />
41+
</ItemGroup>
42+
43+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
44+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
45+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0" />
46+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
47+
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="6.0.0">
48+
<PrivateAssets>all</PrivateAssets>
49+
</PackageReference>
50+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
51+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
52+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
53+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
54+
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.1" />
55+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
56+
<PackageReference Include="Respawn" Version="4.0.0" />
57+
<PackageReference Include="xunit.assert" Version="2.4.2" />
58+
<PackageReference Include="xunit.core" Version="2.4.2" />
59+
</ItemGroup>
60+
2561
<PropertyGroup>
2662
<PackageId>EfCore.TestSupport</PackageId>
27-
<PackageVersion>8.0.0-rc1-0001</PackageVersion>
28-
<Version>8.0.0</Version>
29-
<AssemblyVersion>8.0.0.0</AssemblyVersion>
30-
<FileVersion>8.0.0.0</FileVersion>
63+
<PackageVersion>6.0.0-rc2-0002</PackageVersion>
64+
<Version>6.0.0</Version>
65+
<AssemblyVersion>6.0.0.0</AssemblyVersion>
66+
<FileVersion>6.0.0.0</FileVersion>
3167
<Authors>Jon P Smith</Authors>
3268
<Description>Useful tools when unit testing applications that use Entity Framework Core. See readme file on github.</Description>
3369
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
3470
<PackageReleaseNotes>
35-
- New version to support NET 8 rc1
71+
- New version to support NET 8 rc2 - now supports NET 6, 7, and 8
3672
</PackageReleaseNotes>
3773
<Copyright>Copyright (c) 2020 Jon P Smith. Licenced under MIT licence</Copyright>
3874
<PackageTags>Entity Framework Core, xUnit</PackageTags>

0 commit comments

Comments
 (0)