add support for .Net7 and EF

examples/X.PagedList.Mvc.Example.Core/Program.cs

@@ -1,25 +1,39 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 
 namespace X.PagedList.Mvc.Example.Core;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        CreateHostBuilder(args).Build().Run();
-    }
+        var builder = WebApplication.CreateBuilder(args);
+        builder.Services.AddControllersWithViews();
+
+        var app = builder.Build();
+        if (builder.Environment.IsDevelopment())
+        {
+            app.UseDeveloperExceptionPage();
+        }
+        else
+        {
+            app.UseExceptionHandler("/Home/Error");
+            // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+            app.UseHsts();
+        }
+        app.UseHttpsRedirection();
+        app.UseStaticFiles();
+
+        app.UseRouting();
 
-    public static IHostBuilder CreateHostBuilder(string[] args) =>
-        Host.CreateDefaultBuilder(args)
-            .ConfigureWebHostDefaults(webBuilder =>
-            {
-                webBuilder.UseStartup<Startup>();
-            });
+        app.UseAuthorization();
+
+        app.MapControllerRoute(
+                name: "default",
+                pattern: "{controller=Home}/{action=Index}/{id?}");
+
+        app.Run();
+    }
 }

examples/X.PagedList.Mvc.Example.Core/X.PagedList.Mvc.Example.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/X.PagedList.Mvc.Core/Fluent/HtmlPagerBuilder.cs

@@ -2,9 +2,9 @@
 
 namespace X.PagedList.Mvc.Core.Fluent;
 
-using System;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using System;
 
 internal sealed class HtmlPagerBuilder : IHtmlPagerBuilder
 {

src/X.PagedList.Mvc.Core/Fluent/HtmlPagerExtensions.cs

@@ -1,8 +1,8 @@
 namespace X.PagedList.Mvc.Core.Fluent;
 
-using System.Linq;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using System.Linq;
 
 public static class HtmlPagerExtensions
 {

src/X.PagedList.Mvc.Core/Fluent/IHtmlPagerBuilder.cs

@@ -2,8 +2,8 @@
 
 namespace X.PagedList.Mvc.Core.Fluent;
 
-using System;
 using Microsoft.AspNetCore.Html;
+using System;
 
 public interface IHtmlPagerBuilder
 {

src/X.PagedList.Mvc.Core/HtmlHelperExtension.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Html;
-using X.PagedList.Web.Common;
 using System;
+using X.PagedList.Web.Common;
 using IHtmlHelper = Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper;
 
 namespace X.PagedList.Mvc.Core;

src/X.PagedList.Mvc.Core/TagBuilder.cs

@@ -3,9 +3,9 @@
 
 namespace X.PagedList.Mvc.Core;
 
+using Microsoft.AspNetCore.Html;
 using System.IO;
 using System.Text.Encodings.Web;
-using Microsoft.AspNetCore.Html;
 
 internal sealed class TagBuilder : ITagBuilder
 {

src/X.PagedList.Mvc.Core/X.PagedList.Mvc.Core.csproj

@@ -18,7 +18,7 @@
     <AssemblyOriginatorKeyFile>xpagedlist.snk</AssemblyOriginatorKeyFile>
     <LangVersion>default</LangVersion>
     <PackageVersion>8.4.3</PackageVersion>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/X.PagedList/BasePagedList.cs

@@ -1,7 +1,7 @@
-using System;
+using JetBrains.Annotations;
+using System;
 using System.Collections;
 using System.Collections.Generic;
-using JetBrains.Annotations;
 
 namespace X.PagedList;
 
@@ -67,7 +67,7 @@ protected internal BasePagedList(int pageNumber, int pageSize, int totalItemCoun
         HasNextPage = pageNumberIsGood && PageNumber < PageCount;
         IsFirstPage = pageNumberIsGood && PageNumber == 1;
         IsLastPage = pageNumberIsGood && PageNumber == PageCount;
-			
+
         var numberOfFirstItemOnPage = (PageNumber - 1) * PageSize + 1;
 
         FirstItemOnPage = pageNumberIsGood ? numberOfFirstItemOnPage : 0;

src/X.PagedList/IPagedList.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+using JetBrains.Annotations;
+using System.Collections.Generic;
 
 namespace X.PagedList;