Skip to content

Commit e6051e7

Browse files
JimKerslakeJimKerslake
authored
Merge pull request #74 from cloudscribe/net10.0
Net10.0
2 parents faabba2 + 1101df5 commit e6051e7

File tree

24 files changed

+108
-524
lines changed

24 files changed

+108
-524
lines changed

‎cloudscribe.UserProperties.Kvp.sln‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.Kvp.Storage.EFC
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.Kvp.Storage.EFCore.MySql", "src\cloudscribe.Kvp.Storage.EFCore.MySql\cloudscribe.Kvp.Storage.EFCore.MySql.csproj", "{0F63C3ED-FDFC-432E-A4EF-6C517F920310}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.Kvp.Storage.EFCore.pgsql", "src\cloudscribe.Kvp.Storage.EFCore.pgsql\cloudscribe.Kvp.Storage.EFCore.pgsql.csproj", "{029AD184-1332-47C8-931A-D1E40C49DBEC}"
19-
EndProject
2018
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.Kvp.Storage.EFCore.PostgreSql", "src\cloudscribe.Kvp.Storage.EFCore.PostgreSql\cloudscribe.Kvp.Storage.EFCore.PostgreSql.csproj", "{661BE3A6-5BE9-40B1-B8D7-A3DD01C7A0A7}"
2119
EndProject
2220
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.Kvp.Storage.EFCore.SQLite", "src\cloudscribe.Kvp.Storage.EFCore.SQLite\cloudscribe.Kvp.Storage.EFCore.SQLite.csproj", "{A3CE406E-E9B8-488B-89F3-0996BB8CF1B6}"
@@ -91,18 +89,6 @@ Global
9189
{0F63C3ED-FDFC-432E-A4EF-6C517F920310}.Release|x64.Build.0 = Release|Any CPU
9290
{0F63C3ED-FDFC-432E-A4EF-6C517F920310}.Release|x86.ActiveCfg = Release|Any CPU
9391
{0F63C3ED-FDFC-432E-A4EF-6C517F920310}.Release|x86.Build.0 = Release|Any CPU
94-
{029AD184-1332-47C8-931A-D1E40C49DBEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
95-
{029AD184-1332-47C8-931A-D1E40C49DBEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
96-
{029AD184-1332-47C8-931A-D1E40C49DBEC}.Debug|x64.ActiveCfg = Debug|Any CPU
97-
{029AD184-1332-47C8-931A-D1E40C49DBEC}.Debug|x64.Build.0 = Debug|Any CPU
98-
{029AD184-1332-47C8-931A-D1E40C49DBEC}.Debug|x86.ActiveCfg = Debug|Any CPU
99-
{029AD184-1332-47C8-931A-D1E40C49DBEC}.Debug|x86.Build.0 = Debug|Any CPU
100-
{029AD184-1332-47C8-931A-D1E40C49DBEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
101-
{029AD184-1332-47C8-931A-D1E40C49DBEC}.Release|Any CPU.Build.0 = Release|Any CPU
102-
{029AD184-1332-47C8-931A-D1E40C49DBEC}.Release|x64.ActiveCfg = Release|Any CPU
103-
{029AD184-1332-47C8-931A-D1E40C49DBEC}.Release|x64.Build.0 = Release|Any CPU
104-
{029AD184-1332-47C8-931A-D1E40C49DBEC}.Release|x86.ActiveCfg = Release|Any CPU
105-
{029AD184-1332-47C8-931A-D1E40C49DBEC}.Release|x86.Build.0 = Release|Any CPU
10692
{661BE3A6-5BE9-40B1-B8D7-A3DD01C7A0A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10793
{661BE3A6-5BE9-40B1-B8D7-A3DD01C7A0A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
10894
{661BE3A6-5BE9-40B1-B8D7-A3DD01C7A0A7}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -208,7 +194,6 @@ Global
208194
{26280B75-9A2F-43C2-BCA2-2E1828C72B27} = {26B35914-6144-495B-AE28-CF5E21CA3B94}
209195
{A235563A-A098-471E-9C43-A8C7FE8FC4EF} = {26B35914-6144-495B-AE28-CF5E21CA3B94}
210196
{0F63C3ED-FDFC-432E-A4EF-6C517F920310} = {26B35914-6144-495B-AE28-CF5E21CA3B94}
211-
{029AD184-1332-47C8-931A-D1E40C49DBEC} = {26B35914-6144-495B-AE28-CF5E21CA3B94}
212197
{661BE3A6-5BE9-40B1-B8D7-A3DD01C7A0A7} = {26B35914-6144-495B-AE28-CF5E21CA3B94}
213198
{A3CE406E-E9B8-488B-89F3-0996BB8CF1B6} = {26B35914-6144-495B-AE28-CF5E21CA3B94}
214199
{AD5B40AD-20B6-456E-900F-C6158EA285A5} = {26B35914-6144-495B-AE28-CF5E21CA3B94}

‎src/cloudscribe.Kvp.Models/cloudscribe.Kvp.Models.csproj‎

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

33
<PropertyGroup>
44
<Description>model classes for key/value storage</Description>
5-
<Version>8.8.0</Version>
6-
<TargetFramework>net8.0</TargetFramework>
5+
<Version>10.0.0</Version>
6+
<TargetFramework>net10.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -21,8 +21,8 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="cloudscribe.Core.Models" Version="8.8.0" />
25-
<PackageReference Include="cloudscribe.Pagination.Models" Version="8.8.0" />
24+
<PackageReference Include="cloudscribe.Core.Models" Version="10.0.0" />
25+
<PackageReference Include="cloudscribe.Pagination.Models" Version="10.0.0" />
2626
</ItemGroup>
2727

2828
</Project>

‎src/cloudscribe.Kvp.Storage.EFCore.Common/cloudscribe.Kvp.Storage.EFCore.Common.csproj‎

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

33
<PropertyGroup>
44
<Description>Entity Framework Core common classes for cloudscribe.Kvp</Description>
5-
<Version>8.8.0</Version>
6-
<TargetFramework>net8.0</TargetFramework>
5+
<Version>10.0.0</Version>
6+
<TargetFramework>net10.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp;commands;queries;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -24,10 +24,10 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
30-
<PackageReference Include="cloudscribe.Core.Storage.EFCore.Common" Version="8.8.0" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
30+
<PackageReference Include="cloudscribe.Core.Storage.EFCore.Common" Version="10.0.0" />
3131
</ItemGroup>
3232

3333
</Project>

‎src/cloudscribe.Kvp.Storage.EFCore.MSSQL/cloudscribe.Kvp.Storage.EFCore.MSSQL.csproj‎

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

33
<PropertyGroup>
44
<Description>Entity Framework Core common classes for cloudscribe.Kvp</Description>
5-
<Version>8.8.0</Version>
6-
<TargetFramework>net8.0</TargetFramework>
5+
<Version>10.0.0</Version>
6+
<TargetFramework>net10.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp;commands;queries;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -23,12 +23,12 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="cloudscribe.Versioning" Version="8.8.0" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
29-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
26+
<PackageReference Include="cloudscribe.Versioning" Version="10.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
3232
</ItemGroup>
3333

3434

‎src/cloudscribe.Kvp.Storage.EFCore.MySql/cloudscribe.Kvp.Storage.EFCore.MySql.csproj‎

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

33
<PropertyGroup>
44
<Description>MySql Entity Framework Core storage for cloudscribe.Kvp</Description>
5-
<Version>8.8.0</Version>
6-
<TargetFramework>net8.0</TargetFramework>
5+
<Version>10.0.0</Version>
6+
<TargetFramework>net10.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp;commands;queries;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -24,13 +24,18 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="cloudscribe.Versioning" Version="8.8.0" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
32-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
33-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" />
27+
<!-- WARNING: Pomelo 9.0.0 has RUNTIME incompatibilities with EF Core 10.0.0 -->
28+
<!-- Will get MissingMethodException at runtime when using MySQL provider -->
29+
<!-- TODO: Upgrade to Pomelo 10.0.0 when released -->
30+
<!-- Explicitly reference EF Core 10.x to override Pomelo's 9.x constraint -->
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0" />
32+
<PackageReference Include="cloudscribe.Versioning" Version="10.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
35+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
36+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
38+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
3439
</ItemGroup>
3540

3641
</Project>

‎src/cloudscribe.Kvp.Storage.EFCore.PostgreSql/cloudscribe.Kvp.Storage.EFCore.PostgreSql.csproj‎

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

33
<PropertyGroup>
44
<Description>Entity Framework Core postgresql storage for cloudscribe.Kvp</Description>
5-
<Version>8.8.0</Version>
6-
<TargetFramework>net8.0</TargetFramework>
5+
<Version>10.0.0</Version>
6+
<TargetFramework>net10.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp;commands;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -24,14 +24,14 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="cloudscribe.Versioning" Version="8.8.0" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
32-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
33-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
34-
<PackageReference Include="cloudscribe.EFCore.PostgreSql.Conventions" Version="8.8.0" />
27+
<PackageReference Include="cloudscribe.Versioning" Version="10.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
33+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
34+
<PackageReference Include="cloudscribe.EFCore.PostgreSql.Conventions" Version="10.0.0" />
3535
</ItemGroup>
3636

3737
</Project>

‎src/cloudscribe.Kvp.Storage.EFCore.SQLite/cloudscribe.Kvp.Storage.EFCore.SQLite.csproj‎

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

33
<PropertyGroup>
44
<Description>Entity Framework Core SQLite storage for cloudscribe.Kvp</Description>
5-
<Version>8.8.0</Version>
6-
<TargetFramework>net8.0</TargetFramework>
5+
<Version>10.0.0</Version>
6+
<TargetFramework>net10.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -23,13 +23,13 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="cloudscribe.Versioning" Version="8.8.0" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
29-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
26+
<PackageReference Include="cloudscribe.Versioning" Version="10.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
3333
</ItemGroup>
3434

3535
</Project>

‎src/cloudscribe.Kvp.Storage.EFCore.pgsql/DesignTimeFactory.cs‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/cloudscribe.Kvp.Storage.EFCore.pgsql/KvpDbContext.cs‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎src/cloudscribe.Kvp.Storage.EFCore.pgsql/KvpDbContextFactory.cs‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)