Merge pull request #9 from Rwing/support-70

support .net 7.0

Author: Rwing

EntityFrameworkCore.UseRowNumberForPaging.Test/EntityFrameworkCore.UseRowNumberForPaging.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -19,12 +19,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
-  </ItemGroup>
-
+    
   <ItemGroup>
     <ProjectReference Include="..\EntityFrameworkCore.UseRowNumberForPaging\EntityFrameworkCore.UseRowNumberForPaging.csproj" />
   </ItemGroup>

EntityFrameworkCore.UseRowNumberForPaging.Test/UnitTest1.cs

@@ -14,10 +14,10 @@ public void Test1()
             using (var dbContext = new UseRowNumberDbContext())
             {
                 var rawSql = dbContext.Blogs.Where(i => i.BlogId > 1).Skip(0).Take(10).ToQueryString();
-               rawSql.ShouldContain("ROW_NUMBER");
+                rawSql.ShouldContain("ROW_NUMBER");
             }
         }
-        
+
         [Fact]
         public void Test2()
         {

EntityFrameworkCore.UseRowNumberForPaging/EntityFrameworkCore.UseRowNumberForPaging.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<Version>0.3</Version>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<Version>0.4</Version>
 		<Authors>Rwing</Authors>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<RepositoryUrl>https://github.com/Rwing/EntityFrameworkCore.UseRowNumberForPaging</RepositoryUrl>
 		<PackageProjectUrl>https://github.com/Rwing/EntityFrameworkCore.UseRowNumberForPaging</PackageProjectUrl>
-		<Description>Bring back support for UseRowNumberForPaging in EntityFrameworkCore 6.0/5.0. Use a ROW_NUMBER() in queries instead of OFFSET/FETCH. This method is backwards-compatible to SQL Server 2005.</Description>
+		<Description>Bring back support for UseRowNumberForPaging in EntityFrameworkCore 7.0/6.0/5.0. Use a ROW_NUMBER() in queries instead of OFFSET/FETCH. This method is backwards-compatible to SQL Server 2005.</Description>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -16,10 +16,15 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
 	</ItemGroup>
-
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
+	</ItemGroup>
 	<ItemGroup>
 		<None Include="..\LICENSE">
 			<Pack>True</Pack>

EntityFrameworkCore.UseRowNumberForPaging/SqlServer2008QueryTranslationPostprocessorFactory.cs

@@ -97,9 +97,7 @@ private Expression VisitSelect(SelectExpression selectExpression)
 															   selectExpression.Having,
 															   orderings: newOrderings,
 															   limit: null,
-															   offset: null,
-															   selectExpression.IsDistinct,
-															   selectExpression.Alias);
+															   offset: null);
 					var rowOrderings = oldOrderings.Count != 0 ? oldOrderings
 						: new[] { new OrderingExpression(new SqlFragmentExpression("(SELECT 1)"), true) };
 					selectExpression.PushdownIntoSubquery();