Skip to content

Commit 83532bc

Browse files
JimKerslakeJimKerslake
authored
Merge pull request #37 from cloudscribe/net6.0
net6.0 merge
2 parents a7bf738 + 4150051 commit 83532bc

14 files changed

Lines changed: 281 additions & 1140 deletions

File tree

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

Lines changed: 3 additions & 3 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>5.0.0</Version>
6-
<TargetFramework>net5.0</TargetFramework>
5+
<Version>6.0.0</Version>
6+
<TargetFramework>net6.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -19,7 +19,7 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="cloudscribe.Core.Models" Version="5.0.0" />
22+
<PackageReference Include="cloudscribe.Core.Models" Version="6.0.0" />
2323

2424
<PackageReference Include="cloudscribe.Pagination.Models" Version="1.1.0" />
2525
</ItemGroup>

‎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>5.0.0</Version>
6-
<TargetFramework>net5.0</TargetFramework>
5+
<Version>6.0.0</Version>
6+
<TargetFramework>net6.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp;commands;queries;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -22,10 +22,10 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
28-
<PackageReference Include="cloudscribe.Core.Storage.EFCore.Common" Version="5.0.0" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
28+
<PackageReference Include="cloudscribe.Core.Storage.EFCore.Common" Version="6.0.0" />
2929
</ItemGroup>
3030

3131
</Project>

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

Lines changed: 8 additions & 9 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>5.0.1</Version>
6-
<TargetFramework>net5.0</TargetFramework>
5+
<Version>6.0.0</Version>
6+
<TargetFramework>net6.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp;commands;queries;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -23,13 +23,12 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
27-
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
32-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
26+
<PackageReference Include="cloudscribe.Versioning" Version="6.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
3332
</ItemGroup>
3433

3534

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

Lines changed: 9 additions & 10 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>5.0.1</Version>
6-
<TargetFramework>net5.0</TargetFramework>
5+
<Version>6.0.0</Version>
6+
<TargetFramework>net6.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp;commands;queries;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -24,14 +24,13 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
28-
29-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.5" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
34-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0" />
27+
<PackageReference Include="cloudscribe.Versioning" Version="6.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
33+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
3534

3635
</ItemGroup>
3736

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

Lines changed: 10 additions & 11 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>5.0.1</Version>
6-
<TargetFramework>net5.0</TargetFramework>
5+
<Version>6.0.0</Version>
6+
<TargetFramework>net6.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp;commands;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -24,15 +24,14 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
28-
29-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
34-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.0" />
35-
<PackageReference Include="cloudscribe.EFCore.PostgreSql.Conventions" Version="5.0.0" />
27+
<PackageReference Include="cloudscribe.Versioning" Version="6.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
33+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
34+
<PackageReference Include="cloudscribe.EFCore.PostgreSql.Conventions" Version="6.0.0" />
3635
</ItemGroup>
3736

3837
</Project>

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

Lines changed: 9 additions & 10 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>5.0.0</Version>
6-
<TargetFramework>net5.0</TargetFramework>
5+
<Version>6.0.0</Version>
6+
<TargetFramework>net6.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -23,14 +23,13 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
27-
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0" />
32-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
33-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0" />
26+
<PackageReference Include="cloudscribe.Versioning" Version="6.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
3433

3534
</ItemGroup>
3635

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

Lines changed: 9 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>5.0.0</Version>
6-
<TargetFramework>net5.0</TargetFramework>
5+
<Version>6.0.0</Version>
6+
<TargetFramework>net6.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp;commands;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -24,14 +24,13 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
28-
29-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
34-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.0" />
27+
<PackageReference Include="cloudscribe.Versioning" Version="6.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
33+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
3534

3635
</ItemGroup>
3736

‎src/cloudscribe.Kvp.Storage.NoDb/cloudscribe.Kvp.Storage.NoDb.csproj‎

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

33
<PropertyGroup>
44
<Description>NoDb storage for cloudscribe key/value models. NoDb storage is only recommended for small sites.</Description>
5-
<Version>5.0.0</Version>
6-
<TargetFramework>net5.0</TargetFramework>
5+
<Version>6.0.0</Version>
6+
<TargetFramework>net6.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;kvp;nodb</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
21+
<PackageReference Include="cloudscribe.Versioning" Version="6.0.0" />
2222
<ProjectReference Include="..\cloudscribe.Kvp.Models\cloudscribe.Kvp.Models.csproj" />
2323
</ItemGroup>
2424

‎src/cloudscribe.UserProperties.Kvp/cloudscribe.UserProperties.Kvp.csproj‎

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

33
<PropertyGroup>
44
<Description>Configurable custom user properties for cloudscribe core using per tenant or global configuration based custom proprties with key/value storage</Description>
5-
<Version>5.0.0</Version>
6-
<TargetFramework>net5.0</TargetFramework>
5+
<Version>6.0.0</Version>
6+
<TargetFramework>net6.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;userprofile;customization</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -22,17 +22,16 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
26-
27-
<PackageReference Include="cloudscribe.Core.Models" Version="5.0.0" />
28-
<PackageReference Include="cloudscribe.Core.Identity" Version="5.0.0" />
29-
<PackageReference Include="cloudscribe.Core.Web" Version="5.0.0" />
25+
<PackageReference Include="cloudscribe.Versioning" Version="6.0.0" />
26+
<PackageReference Include="cloudscribe.Core.Models" Version="6.0.0" />
27+
<PackageReference Include="cloudscribe.Core.Identity" Version="6.0.0" />
28+
<PackageReference Include="cloudscribe.Core.Web" Version="6.0.0" />
3029

31-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
32-
<PackageReference Include="Microsoft.Extensions.Localization" Version="5.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
34-
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
35-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
34+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
3635
</ItemGroup>
3736

3837
<ItemGroup>

‎src/cloudscribe.UserProperties/cloudscribe.UserProperties.csproj‎

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

33
<PropertyGroup>
44
<Description>Models for custom user properties that can be configured per tenant for cloudscribe core customization</Description>
5-
<Version>5.0.0</Version>
6-
<TargetFramework>net5.0</TargetFramework>
5+
<Version>6.0.0</Version>
6+
<TargetFramework>net6.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;userprofile;customization</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
@@ -22,13 +22,13 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="cloudscribe.Core.Models" Version="5.0.0" />
26-
<PackageReference Include="cloudscribe.Web.Common" Version="5.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
28-
<PackageReference Include="Microsoft.Extensions.Localization" Version="5.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
30-
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
25+
<PackageReference Include="cloudscribe.Core.Models" Version="6.0.0" />
26+
<PackageReference Include="cloudscribe.Web.Common" Version="6.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
3232
</ItemGroup>
3333

3434
</Project>

0 commit comments

Comments
 (0)