Skip to content

Commit a7bf738

Browse files
JimKerslakeJimKerslake
authored
Merge pull request #34 from cloudscribe/netcore50
Net5.0
2 parents 379d4fe + 21dc1d0 commit a7bf738

15 files changed

Lines changed: 122 additions & 115 deletions

File tree

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

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

33
<PropertyGroup>
44
<Description>model classes for key/value storage</Description>
5-
<Version>4.1.2</Version>
5+
<Version>5.0.0</Version>
6+
<TargetFramework>net5.0</TargetFramework>
67
<Authors>Joe Audette</Authors>
7-
<TargetFrameworks>netstandard2.1</TargetFrameworks>
88
<PackageTags>cloudscribe;kvp</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
1010
<PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
1111
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1212

1313
<RepositoryUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp.git</RepositoryUrl>
1414
<RepositoryType>git</RepositoryType>
15-
1615
</PropertyGroup>
1716

1817
<ItemGroup>
19-
<None Include="icon.png" Pack="true" PackagePath="\"/>
18+
<None Include="icon.png" Pack="true" PackagePath="\" />
2019
</ItemGroup>
2120

2221
<ItemGroup>
23-
<PackageReference Include="cloudscribe.Core.Models" Version="4.1.5" />
22+
<PackageReference Include="cloudscribe.Core.Models" Version="5.0.0" />
23+
2424
<PackageReference Include="cloudscribe.Pagination.Models" Version="1.1.0" />
2525
</ItemGroup>
2626

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

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

33
<PropertyGroup>
44
<Description>Entity Framework Core common classes for cloudscribe.Kvp</Description>
5-
<Version>4.1.2</Version>
5+
<Version>5.0.0</Version>
6+
<TargetFramework>net5.0</TargetFramework>
67
<Authors>Joe Audette</Authors>
7-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
88
<PackageTags>cloudscribe;kvp;commands;queries;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
1010
<PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -14,18 +14,18 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<None Include="icon.png" Pack="true" PackagePath="\"/>
17+
<None Include="icon.png" Pack="true" PackagePath="\" />
1818
</ItemGroup>
1919

2020
<ItemGroup>
2121
<ProjectReference Include="..\cloudscribe.Kvp.Models\cloudscribe.Kvp.Models.csproj" />
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
27-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
28-
<PackageReference Include="cloudscribe.Core.Storage.EFCore.Common" Version="4.1.5" />
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" />
2929
</ItemGroup>
3030

3131
</Project>

‎src/cloudscribe.Kvp.Storage.EFCore.MSSQL/StartupExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static IServiceCollection AddCloudscribeKvpEFStorageMSSQL(
2121
{
2222
services.AddCloudscribeKvpEFCommon();
2323

24-
services.AddEntityFrameworkSqlServer()
24+
services // .AddEntityFrameworkSqlServer()
2525
.AddDbContext<KvpDbContext>(options =>
2626
options.UseSqlServer(connectionString,
2727
sqlServerOptionsAction: sqlOptions =>

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

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

33
<PropertyGroup>
44
<Description>Entity Framework Core common classes for cloudscribe.Kvp</Description>
5-
<Version>4.1.2</Version>
5+
<Version>5.0.1</Version>
6+
<TargetFramework>net5.0</TargetFramework>
67
<Authors>Joe Audette</Authors>
7-
<TargetFramework>netcoreapp3.1</TargetFramework>
88
<PackageTags>cloudscribe;kvp;commands;queries;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
1010
<PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -24,11 +24,12 @@
2424

2525
<ItemGroup>
2626
<PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
29-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
31-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.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" />
3233
</ItemGroup>
3334

3435

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ public class DesignTimeFactory : IDesignTimeDbContextFactory<KvpDbContext>
99
public KvpDbContext CreateDbContext(string[] args)
1010
{
1111
var builder = new DbContextOptionsBuilder<KvpDbContext>();
12-
builder.UseMySql("Server=yourserver;Database=yourdb;Uid=youruser;Pwd=yourpassword;Charset=utf8;");
12+
var connString = "Server=yourserver;Database=yourdb;Uid=youruser;Pwd=yourpassword;Charset=utf8;";
13+
14+
// for breaking changes in Net5.0:
15+
builder.UseMySql(connString, ServerVersion.AutoDetect(connString));
1316
return new KvpDbContext(builder.Options);
1417
}
1518
}

‎src/cloudscribe.Kvp.Storage.EFCore.MySql/StartupExtensions.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ public static IServiceCollection AddCloudscribeKvpEFStorageMySql(
1919
{
2020
services.AddCloudscribeKvpEFCommon();
2121

22-
services.AddEntityFrameworkMySql()
22+
services // .AddEntityFrameworkMySql()
2323
.AddDbContext<KvpDbContext>(options =>
2424
options.UseMySql(connectionString,
25+
ServerVersion.AutoDetect(connectionString), // breaking change here in Net5.0
2526
mySqlOptionsAction: sqlOptions =>
2627
{
2728
if (maxConnectionRetryCount > 0)

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

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

33
<PropertyGroup>
44
<Description>MySql Entity Framework Core storage for cloudscribe.Kvp</Description>
5-
<Version>4.1.2</Version>
5+
<Version>5.0.1</Version>
6+
<TargetFramework>net5.0</TargetFramework>
67
<Authors>Joe Audette</Authors>
7-
<TargetFramework>netcoreapp3.1</TargetFramework>
88
<PackageTags>cloudscribe;kvp;commands;queries;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
1010
<PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -25,12 +25,14 @@
2525

2626
<ItemGroup>
2727
<PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0" />
32-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
33-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.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" />
35+
3436
</ItemGroup>
3537

3638
</Project>

‎src/cloudscribe.Kvp.Storage.EFCore.PostgreSql/StartupExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static IServiceCollection AddCloudscribeKvpPostgreSqlStorage(
2020
services.AddCloudscribeKvpEFCommon();
2121

2222

23-
services.AddEntityFrameworkNpgsql()
23+
services // .AddEntityFrameworkNpgsql()
2424
.AddDbContext<KvpDbContext>(options =>
2525
options.UseNpgsql(connectionString,
2626
npgsqlOptionsAction: sqlOptions =>

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

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

33
<PropertyGroup>
44
<Description>Entity Framework Core postgresql storage for cloudscribe.Kvp</Description>
5-
<Version>4.1.2</Version>
5+
<Version>5.0.1</Version>
6+
<TargetFramework>net5.0</TargetFramework>
67
<Authors>Joe Audette</Authors>
7-
<TargetFramework>netcoreapp3.1</TargetFramework>
88
<PackageTags>cloudscribe;kvp;commands;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
1010
<PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -18,22 +18,21 @@
1818
</ItemGroup>
1919

2020

21-
2221
<ItemGroup>
2322
<ProjectReference Include="..\cloudscribe.Kvp.Models\cloudscribe.Kvp.Models.csproj" />
2423
<ProjectReference Include="..\cloudscribe.Kvp.Storage.EFCore.Common\cloudscribe.Kvp.Storage.EFCore.Common.csproj" />
2524
</ItemGroup>
2625

2726
<ItemGroup>
2827
<PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0" />
33-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
34-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.0" />
35-
<PackageReference Include="cloudscribe.EFCore.PostgreSql.Conventions" Version="4.1.0" />
3628

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" />
3736
</ItemGroup>
3837

3938
</Project>

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

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

33
<PropertyGroup>
44
<Description>Entity Framework Core SQLite storage for cloudscribe.Kvp</Description>
5-
<Version>4.1.2</Version>
5+
<Version>5.0.0</Version>
6+
<TargetFramework>net5.0</TargetFramework>
67
<Authors>Joe Audette</Authors>
7-
<TargetFramework>netcoreapp3.1</TargetFramework>
88
<PackageTags>cloudscribe;kvp;ef</PackageTags>
99
<PackageIcon>icon.png</PackageIcon>
1010
<PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -24,12 +24,13 @@
2424

2525
<ItemGroup>
2626
<PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
29-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0" />
31-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.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" />
3334

3435
</ItemGroup>
3536

0 commit comments

Comments
 (0)