Skip to content

Define and use constants based on EF Core version, not dotnet one #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Akridian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Define and use constants based on EF Core version, not dotnet one #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions EntityFrameworkCore.UseRowNumberForPaging/EntityFrameworkCore.UseRowNumberForPaging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<Version>0.7</Version>
<Authors>Rwing</Authors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<RepositoryUrl>https://github.com/Rwing/EntityFrameworkCore.UseRowNumberForPaging</RepositoryUrl>
Expand All @@ -13,6 +12,18 @@
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<DebugType>embedded</DebugType>
<PackageReadmeFile>README.md</PackageReadmeFile>
<UseEfCore8>false</UseEfCore8>
<UseEfCore9>true</UseEfCore9>
</PropertyGroup>

<PropertyGroup Condition="'$(UseEfCore8)' == 'true'">
<DefineConstants>$(DefineConstants);USE_EF_CORE_8</DefineConstants>
<Version>0.8</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(UseEfCore9)' == 'true'">
<DefineConstants>$(DefineConstants);USE_EF_CORE_9</DefineConstants>
<Version>0.9</Version>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework) != 'net9.0'">
Expand All @@ -23,11 +34,11 @@
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<ItemGroup Condition="'$(UseEfCore8)' == 'true'">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<ItemGroup Condition="'$(UseEfCore9)' == 'true'">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ng/Offset2RowNumberConvertVisitor.net8.cs → ...Offset2RowNumberConvertVisitor.EfCore8.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if !NET9_0_OR_GREATER
#if USE_EF_CORE_8
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion ...ng/Offset2RowNumberConvertVisitor.net9.cs → ...Offset2RowNumberConvertVisitor.EfCore9.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET9_0_OR_GREATER
#if USE_EF_CORE_9
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
Expand Down
12 changes: 6 additions & 6 deletions ...yFrameworkCore.UseRowNumberForPaging/SqlServer2008QueryTranslationPostprocessorFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ public virtual QueryTranslationPostprocessor Create(QueryCompilationContext quer
=> new SqlServer2008QueryTranslationPostprocessor(
_dependencies,
_relationalDependencies,
#if NET9_0_OR_GREATER
#if USE_EF_CORE_9
(RelationalQueryCompilationContext)queryCompilationContext
#else
#elif USE_EF_CORE_8
queryCompilationContext
#endif
);
Expand All @@ -28,9 +28,9 @@ public class SqlServer2008QueryTranslationPostprocessor : RelationalQueryTransla
public SqlServer2008QueryTranslationPostprocessor(
QueryTranslationPostprocessorDependencies dependencies,
RelationalQueryTranslationPostprocessorDependencies relationalDependencies,
#if NET9_0_OR_GREATER
#if USE_EF_CORE_9
RelationalQueryCompilationContext queryCompilationContext
#else
#elif USE_EF_CORE_8
QueryCompilationContext queryCompilationContext
#endif
)
Expand All @@ -40,9 +40,9 @@ QueryCompilationContext queryCompilationContext
public override Expression Process(Expression query)
{
query = base.Process(query);
#if NET9_0_OR_GREATER
#if USE_EF_CORE_9
query = new Offset2RowNumberConvertVisitor(query, RelationalDependencies.SqlExpressionFactory, RelationalQueryCompilationContext.SqlAliasManager).Visit(query);
#else
#elif USE_EF_CORE_8
query = new Offset2RowNumberConvertVisitor(query, RelationalDependencies.SqlExpressionFactory).Visit(query);
#endif
return query;
Expand Down