Skip to content

Commit 601f525

Browse files
EastrallEastrall
authored
Merge pull request #34 from StockDrops/master
Adding support for EF Core 6 and .Net 6.0
2 parents 851fee3 + 25a6d0d commit 601f525

5 files changed

Lines changed: 47 additions & 17 deletions

File tree

‎.azure/pipelines/azure-pipelines.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ steps:
55
- task: UseDotNet@2
66
inputs:
77
packageType: 'sdk'
8-
version: '5.0.x'
8+
version: '6.0.x'
99

1010
# Build solution
1111
- script: |
12-
dotnet build EntityFrameworkCore.DataEncryption.sln --configuration Release
12+
dotnet build EntityFrameworkCore.DataEncryption.sln --configuration Release -f net6.0
1313
displayName: 'Build'
1414

1515
# Test solution
1616
- script: |
17-
dotnet test EntityFrameworkCore.DataEncryption.sln --configuration Release /p:CollectCoverage=true /p:Exclude="[xunit*]*" /p:CoverletOutputFormat=opencover /p:CoverletOutput="../TestResults/TestResults.xml" /maxcpucount:1
17+
dotnet test EntityFrameworkCore.DataEncryption.sln --configuration Release /p:CollectCoverage=true /p:Exclude="[xunit*]*" /p:CoverletOutputFormat=opencover /p:CoverletOutput="../TestResults/TestResults.xml" /maxcpucount:1 -f net6.0
1818
displayName: 'Test'
1919

2020
# Upload coverage

‎samples/AesSample/AesSample.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
66
</PropertyGroup>
77

8-
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.1" />
11-
</ItemGroup>
8+
<ItemGroup Condition="('$(TargetFramework)' == 'net5.0')">
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5,)" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[5,)" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[5,)" />
12+
</ItemGroup>
13+
<ItemGroup Condition="('$(TargetFramework)' == 'net6.0')">
14+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6,)" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[6,)" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[6,)" />
17+
</ItemGroup>
1218

1319
<ItemGroup>
1420
<ProjectReference Include="..\..\src\EntityFrameworkCore.DataEncryption\EntityFrameworkCore.DataEncryption.csproj" />

‎src/EntityFrameworkCore.DataEncryption/EntityFrameworkCore.DataEncryption.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net6.0;net5.0</TargetFrameworks>
55
<LangVersion>9.0</LangVersion>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<AssemblyName>EntityFrameworkCore.DataEncryption</AssemblyName>
88
<RootNamespace>Microsoft.EntityFrameworkCore.DataEncryption</RootNamespace>
99
<IsPackable>true</IsPackable>
10-
<Version>3.0.0</Version>
10+
<Version>3.0.1-dev</Version>
1111
<Authors>Filipe GOMES PEIXOTO</Authors>
1212
<PackageId>EntityFrameworkCore.DataEncryption</PackageId>
1313
<PackageProjectUrl>https://github.com/Eastrall/EntityFrameworkCore.DataEncryption</PackageProjectUrl>
@@ -28,10 +28,22 @@
2828
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
2929
</PropertyGroup>
3030

31-
<ItemGroup>
32-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
31+
<ItemGroup Condition="('$(TargetFramework)' == 'netstandard2.0')">
32+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[3.1,6)" />
3333
</ItemGroup>
34-
34+
<ItemGroup Condition="('$(TargetFramework)' == 'netcoreapp3.1')">
35+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[3.1,6)" />
36+
</ItemGroup>
37+
<ItemGroup Condition="('$(TargetFramework)' == 'netstandard2.1')">
38+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5,)" />
39+
</ItemGroup>
40+
<ItemGroup Condition="('$(TargetFramework)' == 'net5.0')">
41+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5,)" />
42+
</ItemGroup>
43+
<ItemGroup Condition="('$(TargetFramework)' == 'net6.0')">
44+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6,)" />
45+
</ItemGroup>
46+
3547
<ItemGroup>
3648
<None Include="..\..\LICENSE">
3749
<Pack>True</Pack>

‎src/EntityFrameworkCore.DataEncryption/Migration/EncryptionMigrator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public static async Task MigrateAsync(this DbContext context, IProperty property
8888
var set = context.Set(property.DeclaringEntityType);
8989
var list = await set.ToListAsync(cancellationToken);
9090

91-
logger?.LogInformation("Migrating data for {EntityType} :: {Property}} ({RecordCount} records)...",
91+
logger?.LogInformation("Migrating data for {EntityType} :: {Property} ({RecordCount} records)...",
9292
property.DeclaringEntityType.Name, property.Name, list.Count);
9393

9494
foreach (var entity in list)

‎test/EntityFrameworkCore.DataEncryption.Test/EntityFrameworkCore.DataEncryption.Test.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<AssemblyName>Microsoft.EntityFrameworkCore.Encryption.Test</AssemblyName>
77
<RootNamespace>Microsoft.EntityFrameworkCore.Encryption.Test</RootNamespace>
@@ -13,8 +13,7 @@
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.1" />
16+
1817
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
1918
<PackageReference Include="xunit" Version="2.4.1" />
2019
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
@@ -27,5 +26,18 @@
2726
<ItemGroup>
2827
<ProjectReference Include="..\..\src\EntityFrameworkCore.DataEncryption\EntityFrameworkCore.DataEncryption.csproj" />
2928
</ItemGroup>
29+
30+
<ItemGroup Condition="('$(TargetFramework)' == 'netcoreapp3.1')">
31+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[3.1,6)" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[3.1,6)" />
33+
</ItemGroup>
34+
<ItemGroup Condition="('$(TargetFramework)' == 'net5.0')">
35+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5,)" />
36+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[5,)" />
37+
</ItemGroup>
38+
<ItemGroup Condition="('$(TargetFramework)' == 'net6.0')">
39+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6,)" />
40+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[6,)" />
41+
</ItemGroup>
3042

3143
</Project>

0 commit comments

Comments
 (0)