Skip to content

Commit

Permalink
Merge pull request #69 from SoftFluent/Support_Net9
Browse files Browse the repository at this point in the history
Support .Net 9.0
  • Loading branch information
XarSoft authored Nov 13, 2024
2 parents 418a8f0 + d97d03e commit c54b9e1
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 26 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
6.0.x
7.0.x
8.0.x
9.0.x
- name: Display .NET version
run: dotnet --version
Expand All @@ -31,7 +32,7 @@ jobs:
run: dotnet restore

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

- name: Run unit tests
run: dotnet test --configuration Release --collect:"XPlat Code Coverage" --settings ./test/EntityFrameworkCore.DataEncryption.Test/runsettings.xml
Expand Down
8 changes: 4 additions & 4 deletions samples/AesSample.Fluent/SoftFluent.AesSample.Fluent.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>10</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions samples/AesSample/SoftFluent.AesSample.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>10</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
</ItemGroup>

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

</Project>
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<LangVersion>10.0</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyName>SoftFluent.EntityFrameworkCore.DataEncryption</AssemblyName>
<RootNamespace>SoftFluent.EntityFrameworkCore.DataEncryption</RootNamespace>
<IsPackable>true</IsPackable>
<Version>6.0.0</Version>
<Authors>Filipe GOMES PEIXOTO</Authors>
<Version>7.0.0</Version>
<Authors>SoftFluent</Authors>
<Company>SoftFluent</Company>
<PackageId>EntityFrameworkCore.DataEncryption</PackageId>
<PackageProjectUrl>https://github.com/SoftFluent/EntityFrameworkCore.DataEncryption</PackageProjectUrl>
Expand Down Expand Up @@ -36,16 +36,19 @@
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[3.1,6)" />
</ItemGroup>
<ItemGroup Condition="('$(TargetFramework)' == 'net6.0')">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6,8)" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.36,8)" />
</ItemGroup>
<ItemGroup Condition="('$(TargetFramework)' == 'net7.0')">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[7,)" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[7,9)" />
</ItemGroup>
<ItemGroup Condition="('$(TargetFramework)' == 'net8.0')">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8,)" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.0.11,)" />
</ItemGroup>
<ItemGroup Condition="('$(TargetFramework)' == 'net9.0')">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[9,)" />
</ItemGroup>

<ItemGroup>
<ItemGroup>
<None Include="..\..\LICENSE">
<Pack>True</Pack>
<PackagePath></PackagePath>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>10</LangVersion>
<IsPackable>false</IsPackable>
<AssemblyName>SoftFluent.EntityFrameworkCore.Encryption.Test</AssemblyName>
Expand All @@ -13,16 +13,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Bogus" Version="34.0.2" />
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="Bogus" Version="35.6.1" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit c54b9e1

Please sign in to comment.