Skip to content

Commit c54b9e1

Browse files
XarSoftXarSoft
authored
Merge pull request #69 from SoftFluent/Support_Net9
Support .Net 9.0
2 parents 418a8f0 + d97d03e commit c54b9e1

5 files changed

Lines changed: 30 additions & 26 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
6.0.x
2424
7.0.x
2525
8.0.x
26+
9.0.x
2627
2728
- name: Display .NET version
2829
run: dotnet --version
@@ -31,7 +32,7 @@ jobs:
3132
run: dotnet restore
3233

3334
- name: Build
34-
run: dotnet build SoftFluent.EntityFrameworkCore.DataEncryption.sln --configuration Release -f net8.0 --no-restore
35+
run: dotnet build SoftFluent.EntityFrameworkCore.DataEncryption.sln --configuration Release -f net9.0 --no-restore
3536

3637
- name: Run unit tests
3738
run: dotnet test --configuration Release --collect:"XPlat Code Coverage" --settings ./test/EntityFrameworkCore.DataEncryption.Test/runsettings.xml

‎samples/AesSample.Fluent/SoftFluent.AesSample.Fluent.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<LangVersion>10</LangVersion>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎samples/AesSample/SoftFluent.AesSample.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<LangVersion>10</LangVersion>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<ProjectReference Include="..\..\src\EntityFrameworkCore.DataEncryption\SoftFluent.EntityFrameworkCore.DataEncryption.csproj" />
16+
<ProjectReference Include="..\..\src\EntityFrameworkCore.DataEncryption\SoftFluent.EntityFrameworkCore.DataEncryption.csproj" />
1717
</ItemGroup>
1818

1919
</Project>

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
55
<LangVersion>10.0</LangVersion>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<AssemblyName>SoftFluent.EntityFrameworkCore.DataEncryption</AssemblyName>
88
<RootNamespace>SoftFluent.EntityFrameworkCore.DataEncryption</RootNamespace>
99
<IsPackable>true</IsPackable>
10-
<Version>6.0.0</Version>
11-
<Authors>Filipe GOMES PEIXOTO</Authors>
10+
<Version>7.0.0</Version>
11+
<Authors>SoftFluent</Authors>
1212
<Company>SoftFluent</Company>
1313
<PackageId>EntityFrameworkCore.DataEncryption</PackageId>
1414
<PackageProjectUrl>https://github.com/SoftFluent/EntityFrameworkCore.DataEncryption</PackageProjectUrl>
@@ -36,16 +36,19 @@
3636
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[3.1,6)" />
3737
</ItemGroup>
3838
<ItemGroup Condition="('$(TargetFramework)' == 'net6.0')">
39-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6,8)" />
39+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.36,8)" />
4040
</ItemGroup>
4141
<ItemGroup Condition="('$(TargetFramework)' == 'net7.0')">
42-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[7,)" />
42+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[7,9)" />
4343
</ItemGroup>
4444
<ItemGroup Condition="('$(TargetFramework)' == 'net8.0')">
45-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8,)" />
45+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.0.11,)" />
4646
</ItemGroup>
47+
<ItemGroup Condition="('$(TargetFramework)' == 'net9.0')">
48+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[9,)" />
49+
</ItemGroup>
4750

48-
<ItemGroup>
51+
<ItemGroup>
4952
<None Include="..\..\LICENSE">
5053
<Pack>True</Pack>
5154
<PackagePath></PackagePath>

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

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<LangVersion>10</LangVersion>
66
<IsPackable>false</IsPackable>
77
<AssemblyName>SoftFluent.EntityFrameworkCore.Encryption.Test</AssemblyName>
@@ -13,16 +13,16 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Bogus" Version="34.0.2" />
17-
<PackageReference Include="coverlet.collector" Version="3.2.0">
16+
<PackageReference Include="Bogus" Version="35.6.1" />
17+
<PackageReference Include="coverlet.collector" Version="6.0.2">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
22-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
24-
<PackageReference Include="xunit" Version="2.4.2" />
25-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
21+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
22+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
24+
<PackageReference Include="xunit" Version="2.9.2" />
25+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2828
</PackageReference>

0 commit comments

Comments
 (0)