Skip to content

Commit 8f92561

Browse files
authored
Add .NET 9 (#853)
* Add .NET 9 * gha * . * x * 9 * Install dependencies * 8 * 8... * <TargetFrameworks>net8.0;net9.0</TargetFrameworks> * ?
1 parent 8b56086 commit 8f92561

File tree

19 files changed

+186
-30
lines changed

19 files changed

+186
-30
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,16 @@ jobs:
1919
- uses: actions/checkout@v4
2020
with:
2121
fetch-depth: 0
22+
23+
- uses: actions/setup-dotnet@v4
24+
with:
25+
dotnet-version: '9.0.x'
2226

2327
- name: Build
2428
run: |
2529
dotnet build ./src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj -c Release -p:buildType=azure-pipelines-ci
2630
27-
- name: Run Tests EFCore net8.0
31+
- name: Run Tests EFCore net9.0
2832
run: |
2933
dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj -c Release -p:buildType=azure-pipelines-ci
3034
@@ -38,6 +42,10 @@ jobs:
3842

3943
steps:
4044
- uses: actions/checkout@v4
45+
46+
- uses: actions/setup-dotnet@v4
47+
with:
48+
dotnet-version: '9.0.x'
4149

4250
- uses: actions/setup-java@v4
4351
with:
@@ -75,13 +83,18 @@ jobs:
7583
7684
- name: Run Tests EFCore net8.0 (with Coverage)
7785
run: |
78-
dotnet-coverage collect 'dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj --configuration Debug -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-efcore.xml
86+
dotnet-coverage collect 'dotnet test ./test/System.Linq.Dynamic.Core.Tests.Net8/System.Linq.Dynamic.Core.Tests.Net8.csproj --configuration Debug --framework net8.0 -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-efcore.xml
7987
8088
- name: End analysis on SonarCloud
8189
if: ${{ steps.secret-check.outputs.run_analysis == 'true' }}
8290
run: |
8391
dotnet sonarscanner end /d:sonar.token=${{ secrets.SONAR_TOKEN }}
8492
93+
# - name: Run Tests EFCore net8.0
94+
# run: |
95+
# dotnet test ./test/System.Linq.Dynamic.Core.Tests.Net7/System.Linq.Dynamic.Core.Tests.Net8.csproj -c Release -p:buildType=azure-pipelines-ci
96+
# continue-on-error: true
97+
8598
# - name: Run Tests EFCore net7.0
8699
# run: |
87100
# dotnet test ./test/System.Linq.Dynamic.Core.Tests.Net7/System.Linq.Dynamic.Core.Tests.Net7.csproj -c Release -p:buildType=azure-pipelines-ci

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ If it's not possible to add that attribute, you need to implement a custom [Cust
7777
The following frameworks are supported:
7878
- net35, net40, net45, net46 and up
7979
- netstandard1.3, netstandard2.0 and netstandard2.1
80-
- netcoreapp3.1, net5.0, net6.0, net7.0 and net8.0
80+
- netcoreapp3.1, net5.0, net6.0, net7.0, net8.0 and net9.0
8181
- uap10.0
8282

8383
### Fork details

System.Linq.Dynamic.Core.sln

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmDynamicLinq", "src-blaz
147147
EndProject
148148
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SldcTrimmer", "src-examples\SldcTrimmer\SldcTrimmer.csproj", "{7A31366C-DD98-41A3-A0C1-A97068BD9658}"
149149
EndProject
150+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.EntityFrameworkCore.DynamicLinq.EFCore9", "src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore9\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore9.csproj", "{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}"
151+
EndProject
152+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Dynamic.Core.Tests.Net8", "test\System.Linq.Dynamic.Core.Tests.Net8\System.Linq.Dynamic.Core.Tests.Net8.csproj", "{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}"
153+
EndProject
150154
Global
151155
GlobalSection(SolutionConfigurationPlatforms) = preSolution
152156
Debug|Any CPU = Debug|Any CPU
@@ -931,6 +935,38 @@ Global
931935
{7A31366C-DD98-41A3-A0C1-A97068BD9658}.Release|x64.Build.0 = Release|Any CPU
932936
{7A31366C-DD98-41A3-A0C1-A97068BD9658}.Release|x86.ActiveCfg = Release|Any CPU
933937
{7A31366C-DD98-41A3-A0C1-A97068BD9658}.Release|x86.Build.0 = Release|Any CPU
938+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
939+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|Any CPU.Build.0 = Debug|Any CPU
940+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|ARM.ActiveCfg = Debug|Any CPU
941+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|ARM.Build.0 = Debug|Any CPU
942+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|x64.ActiveCfg = Debug|Any CPU
943+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|x64.Build.0 = Debug|Any CPU
944+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|x86.ActiveCfg = Debug|Any CPU
945+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|x86.Build.0 = Debug|Any CPU
946+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|Any CPU.ActiveCfg = Release|Any CPU
947+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|Any CPU.Build.0 = Release|Any CPU
948+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|ARM.ActiveCfg = Release|Any CPU
949+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|ARM.Build.0 = Release|Any CPU
950+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|x64.ActiveCfg = Release|Any CPU
951+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|x64.Build.0 = Release|Any CPU
952+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|x86.ActiveCfg = Release|Any CPU
953+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|x86.Build.0 = Release|Any CPU
954+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
955+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
956+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|ARM.ActiveCfg = Debug|Any CPU
957+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|ARM.Build.0 = Debug|Any CPU
958+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|x64.ActiveCfg = Debug|Any CPU
959+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|x64.Build.0 = Debug|Any CPU
960+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|x86.ActiveCfg = Debug|Any CPU
961+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|x86.Build.0 = Debug|Any CPU
962+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
963+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|Any CPU.Build.0 = Release|Any CPU
964+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|ARM.ActiveCfg = Release|Any CPU
965+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|ARM.Build.0 = Release|Any CPU
966+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|x64.ActiveCfg = Release|Any CPU
967+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|x64.Build.0 = Release|Any CPU
968+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|x86.ActiveCfg = Release|Any CPU
969+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|x86.Build.0 = Release|Any CPU
934970
EndGlobalSection
935971
GlobalSection(SolutionProperties) = preSolution
936972
HideSolutionNode = FALSE
@@ -984,6 +1020,8 @@ Global
9841020
{7AFC2836-0F6E-4B0D-8BB3-13317A3B6616} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
9851021
{2DE2052F-0A50-40C7-B6FF-52B52386BF9A} = {122BC4FA-7563-4E35-9D17-077F16F1629F}
9861022
{7A31366C-DD98-41A3-A0C1-A97068BD9658} = {BCA2A024-9032-4E56-A6C4-17A15D921728}
1023+
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
1024+
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
9871025
EndGlobalSection
9881026
GlobalSection(ExtensibilityGlobals) = postSolution
9891027
SolutionGuid = {94C56722-194E-4B8B-BC23-B3F754E89A20}

src/Directory.Build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,8 @@
2525
<None Include="../../resources/logo.png" Pack="true" PackagePath="" />
2626
<None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>
2727
</ItemGroup>
28+
29+
<ItemGroup>
30+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
31+
</ItemGroup>
2832
</Project>

src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
<ProjectReference Include="..\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj" />
3535
</ItemGroup>
3636

37-
<ItemGroup>
38-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
39-
</ItemGroup>
40-
4137
<ItemGroup>
4238
<PackageReference Include="EntityFramework" Version="6.5.0" />
4339
</ItemGroup>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
4342
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
4443
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
4544
</ItemGroup>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
4544
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
4645
</ItemGroup>
4746

48-
</Project>
47+
</Project>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
</ItemGroup>
4343

4444
<ItemGroup>
45-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
4645
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
4746
</ItemGroup>
4847
</Project>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
</ItemGroup>
4343

4444
<ItemGroup>
45-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
4645
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
4746
</ItemGroup>
4847
</Project>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore7/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore7.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
</ItemGroup>
4343

4444
<ItemGroup>
45-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
4645
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
4746
</ItemGroup>
4847
</Project>

0 commit comments

Comments
 (0)