diff --git a/EntityFrameworkCore.UseRowNumberForPaging/EntityFrameworkCore.UseRowNumberForPaging.csproj b/EntityFrameworkCore.UseRowNumberForPaging/EntityFrameworkCore.UseRowNumberForPaging.csproj
index 696879a..d51ba3e 100644
--- a/EntityFrameworkCore.UseRowNumberForPaging/EntityFrameworkCore.UseRowNumberForPaging.csproj
+++ b/EntityFrameworkCore.UseRowNumberForPaging/EntityFrameworkCore.UseRowNumberForPaging.csproj
@@ -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>
@@ -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'">
@@ -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>
diff --git a/EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.net8.cs b/EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.EfCore8.cs
similarity index 99%
rename from EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.net8.cs
rename to EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.EfCore8.cs
index e733652..b926e4c 100644
--- a/EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.net8.cs
+++ b/EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.EfCore8.cs
@@ -1,4 +1,4 @@
-#if !NET9_0_OR_GREATER
+#if USE_EF_CORE_8
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.net9.cs b/EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.EfCore9.cs
similarity index 99%
rename from EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.net9.cs
rename to EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.EfCore9.cs
index b5bda52..686a285 100644
--- a/EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.net9.cs
+++ b/EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.EfCore9.cs
@@ -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;
diff --git a/EntityFrameworkCore.UseRowNumberForPaging/SqlServer2008QueryTranslationPostprocessorFactory.cs b/EntityFrameworkCore.UseRowNumberForPaging/SqlServer2008QueryTranslationPostprocessorFactory.cs
index 6967bb4..4942993 100644
--- a/EntityFrameworkCore.UseRowNumberForPaging/SqlServer2008QueryTranslationPostprocessorFactory.cs
+++ b/EntityFrameworkCore.UseRowNumberForPaging/SqlServer2008QueryTranslationPostprocessorFactory.cs
@@ -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
             );
@@ -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
             )
@@ -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;