Merge pull request #293 from dncuug/292-align-namespaces-restore-package-names-for-xpagedlist-after-nuget-team-approval

a-gubskiy · web-flow · commit 35e4e2e9a09d · 2024-09-20T21:57:47.000+03:00
Align namespaces for X.PagedList after NuGet team prefix reservation approval
diff --git a/README.md b/README.md
@@ -4,11 +4,6 @@
 [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/andrew_gubskiy.svg?style=social&label=Follow%20me!)](https://twitter.com/intent/user?screen_name=andrew_gubskiy)
 
 
-## Important announcement for X.PagedList users!
-
-⚠️ [Namespace Transferring Announcement for X.PagedList Users](https://andrey-gubskiy.medium.com/namespace-transferring-announcement-for-x-pagedlist-users-234809138ff5).
-
-
 ## What is this?
 This is a fork of [Troy's](https://github.com/troygoode) project PagedList. The main difference is that X.PagedList is a library that supports the 
 modern .NET platform — you can use it everywhere the .NET platform is supported.
diff --git a/X.PagedList.sln b/X.PagedList.sln
@@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.Extensions.PagedList.EF",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X.PagedList.Mvc.Core", "src\X.PagedList.Mvc.Core\X.PagedList.Mvc.Core.csproj", "{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X.PagedList.EF", "src\X.PagedList.EF\X.PagedList.EF.csproj", "{B72170CA-12E0-46E5-821C-FCE7E6F79736}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -60,6 +62,10 @@ Global
 		{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B72170CA-12E0-46E5-821C-FCE7E6F79736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B72170CA-12E0-46E5-821C-FCE7E6F79736}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B72170CA-12E0-46E5-821C-FCE7E6F79736}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B72170CA-12E0-46E5-821C-FCE7E6F79736}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -72,6 +78,7 @@ Global
 		{AD16A8D1-EAF0-4947-BCEC-A8B423B2F117} = {309A8FC8-4784-4D8D-903F-BD54EBB0F1D7}
 		{1934BC10-30AE-4C4C-AF22-E444B1F70ACA} = {BDDADD09-D112-418E-8469-BC762EC09936}
 		{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE} = {BDDADD09-D112-418E-8469-BC762EC09936}
+		{B72170CA-12E0-46E5-821C-FCE7E6F79736} = {BDDADD09-D112-418E-8469-BC762EC09936}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1A82D446-6F26-48B2-8085-DFA5F87453FC}
diff --git a/examples/Example.Website/Areas/Internal/Views/Admin/Index.cshtml b/examples/Example.Website/Areas/Internal/Views/Admin/Index.cshtml
@@ -1,7 +1,7 @@
 ﻿@model IPagedList<string>
 
 @using X.PagedList;
-@using X.Web.PagedList
+@using X.PagedList.Mvc.Core
 
 @{
     ViewBag.Title = "Internal Admin Product Listing";
diff --git a/examples/Example.Website/Controllers/EFController.cs b/examples/Example.Website/Controllers/EFController.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Example.DAL;
 using Microsoft.AspNetCore.Mvc;
-using X.Extensions.PagedList.EF;
+using X.PagedList.EF;
 
 namespace Example.Website.Controllers;
 
diff --git a/examples/Example.Website/Example.Website.csproj b/examples/Example.Website/Example.Website.csproj
@@ -6,9 +6,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\X.Extensions.PagedList.EF\X.Extensions.PagedList.EF.csproj" />
+        <ProjectReference Include="..\..\src\X.PagedList.EF\X.PagedList.EF.csproj" />
         <ProjectReference Include="..\..\src\X.PagedList\X.PagedList.csproj"/>
-        <ProjectReference Include="..\..\src\X.Web.PagedList\X.Web.PagedList.csproj" />
+        <ProjectReference Include="..\..\src\X.PagedList.Mvc.Core\X.PagedList.Mvc.Core.csproj" />
         <ProjectReference Include="..\Example.DAL\Example.DAL.csproj"/>
     </ItemGroup>
 
diff --git a/examples/Example.Website/Views/Bootstrap41/Index.cshtml b/examples/Example.Website/Views/Bootstrap41/Index.cshtml
@@ -4,7 +4,7 @@
 }
 
 @using X.PagedList;
-@using X.Web.PagedList
+@using X.PagedList.Mvc.Core
 @*import this so we can cast our list to IPagedList (only necessary because ViewBag is dynamic)*@
 
 <!-- import the included stylesheet for some (very basic) default styling -->
diff --git a/examples/Example.Website/Views/EF/Index.cshtml b/examples/Example.Website/Views/EF/Index.cshtml
@@ -4,8 +4,8 @@
 }
 
 @using X.PagedList;
-@using X.Web.PagedList
-@using X.Web.PagedList.Fluent
+@using X.PagedList.Mvc.Core
+@using X.PagedList.Mvc.Core.Fluent
 @*import this so we can cast our list to IPagedList (only necessary because ViewBag is dynamic)*@
 
 
diff --git a/examples/Example.Website/Views/Home/Index.cshtml b/examples/Example.Website/Views/Home/Index.cshtml
@@ -4,8 +4,8 @@
 }
 
 @using X.PagedList;
-@using X.Web.PagedList
-@using X.Web.PagedList.Fluent
+@using X.PagedList.Mvc.Core
+@using X.PagedList.Mvc.Core.Fluent
 @*import this so we can cast our list to IPagedList (only necessary because ViewBag is dynamic)*@
 
 
diff --git a/examples/Example.Website/Views/Shared/Paging/_Pager.cshtml b/examples/Example.Website/Views/Shared/Paging/_Pager.cshtml
@@ -1,5 +1,5 @@
 ﻿@using System.Text
-@using X.Web.PagedList
+@using X.PagedList.Mvc.Core
 
 @model X.PagedList.IPagedList
 
diff --git a/examples/Example.Website/Views/Shared/Paging/_Pager_85.cshtml b/examples/Example.Website/Views/Shared/Paging/_Pager_85.cshtml
@@ -1,5 +1,5 @@
 ﻿@using System.Text
-@using X.Web.PagedList
+@using X.PagedList.Mvc.Core
 
 @model X.PagedList.IPagedList
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -10,10 +10,10 @@
         <Copyright>Andrew Gubskiy © 2024</Copyright>
         <Company>Ukrainian .NET Developer Community</Company>
 
-        <Version>10.1.2</Version>
-        <AssemblyVersion>10.1.2</AssemblyVersion>
-        <FileVersion>10.1.2</FileVersion>
-        <PackageVersion>10.1.2</PackageVersion>
+        <Version>10.2.1</Version>
+        <AssemblyVersion>10.2.1</AssemblyVersion>
+        <FileVersion>10.2.1</FileVersion>
+        <PackageVersion>10.2.1</PackageVersion>
 
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/dncuug/X.PagedList.git</RepositoryUrl>
@@ -22,7 +22,13 @@
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>xpagedlist.snk</AssemblyOriginatorKeyFile>
 
-        <Nullable>enable</Nullable>
+        <Nullable>enable</Nullable>       
+
+        <PackageIcon>x-pagedlist.png</PackageIcon>
     </PropertyGroup>
 
+    <ItemGroup>
+        <None Include="../../x-pagedlist.png" Pack="True" PackagePath=""/>
+    </ItemGroup>
+
 </Project>
diff --git a/src/X.Extensions.PagedList.EF/README.md b/src/X.Extensions.PagedList.EF/README.md
@@ -1,13 +1,6 @@
 # X.Extensions.PagedList.EF
 
-[![NuGet Version](http://img.shields.io/nuget/v/X.Extensions.PagedList.EF.svg?style=flat)](https://www.nuget.org/packages/X.Extensions.PagedList.EF/)
-[![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/andrew_gubskiy.svg?style=social&label=Follow%20me!)](https://twitter.com/intent/user?screen_name=andrew_gubskiy)
-
-
-## What is this?
-The X.Extensions.PagedList.EF library provides Entity Framework Core extensions for the X.PagedList library, enabling easier 
-paging through data collections within Entity Framework contexts. This extension facilitates the creation of paged 
-lists from IQueryable collections, streamlining the process of managing large datasets in .NET applications.
+The X.Extensions.PagedList.EF was migrated to the X.PagedList.EF.
 
 ## How to use
 You can find all information about how to use X.PagedList libraries in [Wiki](https://github.com/dncuug/X.PagedList/wiki)
diff --git a/src/X.Extensions.PagedList.EF/X.Extensions.PagedList.EF.csproj b/src/X.Extensions.PagedList.EF/X.Extensions.PagedList.EF.csproj
@@ -8,7 +8,6 @@
         <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
 
         <PackageTags>paging pagedlist paged list entity framework ef</PackageTags>
-        <PackageIcon>x-extensions.png</PackageIcon>
     </PropertyGroup>
 
     <ItemGroup>
@@ -19,24 +18,12 @@
         <None Include="../../LICENSE.md" Pack="true" PackagePath=""/>
     </ItemGroup>
 
-    <ItemGroup>
-        <None Include="../../x-extensions.png" Pack="True" PackagePath=""/>
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[7.0.20,8)"/>
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7"/>
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="all"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\X.PagedList\X.PagedList.csproj"/>
+      <ProjectReference Include="..\X.PagedList.EF\X.PagedList.EF.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/X.PagedList.EF/PagedListExtensions.cs b/src/X.PagedList.EF/PagedListExtensions.cs
@@ -5,9 +5,8 @@
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
-using X.PagedList;
 
-namespace X.Extensions.PagedList.EF;
+namespace X.PagedList.EF;
 
 /// <summary>
 /// EntityFramework extension methods designed to simplify the creation of instances of <see cref="PagedList{T}"/>.
diff --git a/src/X.PagedList.EF/README.md b/src/X.PagedList.EF/README.md
@@ -0,0 +1,16 @@
+# X.Extensions.PagedList.EF
+
+[![NuGet Version](http://img.shields.io/nuget/v/X.Extensions.PagedList.EF.svg?style=flat)](https://www.nuget.org/packages/X.Extensions.PagedList.EF/)
+[![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/andrew_gubskiy.svg?style=social&label=Follow%20me!)](https://twitter.com/intent/user?screen_name=andrew_gubskiy)
+
+
+## What is this?
+The X.Extensions.PagedList.EF library provides Entity Framework Core extensions for the X.PagedList library, enabling easier 
+paging through data collections within Entity Framework contexts. This extension facilitates the creation of paged 
+lists from IQueryable collections, streamlining the process of managing large datasets in .NET applications.
+
+## How to use
+You can find all information about how to use X.PagedList libraries in [Wiki](https://github.com/dncuug/X.PagedList/wiki)
+
+## License
+Licensed under the [MIT License](https://github.com/dncuug/X.PagedList/blob/master/LICENSE).
diff --git a/src/X.PagedList.EF/X.PagedList.EF.csproj b/src/X.PagedList.EF/X.PagedList.EF.csproj
@@ -0,0 +1,37 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Title>X.PagedList.EF</Title>
+        <Description>EF extensions for X.PagedList library</Description>
+
+        <LangVersion>default</LangVersion>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+
+        <PackageTags>paging pagedlist paged list entity framework ef</PackageTags>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="README.md" Pack="true" PackagePath=""/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="../../LICENSE.md" Pack="true" PackagePath=""/>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[7.0.20,8)"/>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="all"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\X.PagedList\X.PagedList.csproj"/>
+    </ItemGroup>
+
+</Project>
diff --git a/src/X.PagedList.EF/xpagedlist.snk b/src/X.PagedList.EF/xpagedlist.snk
diff --git a/src/X.PagedList.Mvc.Core/AjaxOptions.cs b/src/X.PagedList.Mvc.Core/AjaxOptions.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace X.Web.PagedList;
+namespace X.PagedList.Mvc.Core;
 
 public class AjaxOptions
 {
diff --git a/src/X.PagedList.Mvc.Core/Fluent/HtmlPagerBuilder.cs b/src/X.PagedList.Mvc.Core/Fluent/HtmlPagerBuilder.cs
@@ -1,9 +1,8 @@
 ﻿using System;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using X.PagedList;
 
-namespace X.Web.PagedList.Fluent;
+namespace X.PagedList.Mvc.Core.Fluent;
 
 internal sealed class HtmlPagerBuilder : IHtmlPagerBuilder
 {
diff --git a/src/X.PagedList.Mvc.Core/Fluent/HtmlPagerExtensions.cs b/src/X.PagedList.Mvc.Core/Fluent/HtmlPagerExtensions.cs
@@ -2,9 +2,8 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using X.PagedList;
 
-namespace X.Web.PagedList.Fluent;
+namespace X.PagedList.Mvc.Core.Fluent;
 
 [PublicAPI]
 public static class HtmlPagerExtensions
diff --git a/src/X.PagedList.Mvc.Core/Fluent/IHtmlPagerBuilder.cs b/src/X.PagedList.Mvc.Core/Fluent/IHtmlPagerBuilder.cs
@@ -2,7 +2,7 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Html;
 
-namespace X.Web.PagedList.Fluent;
+namespace X.PagedList.Mvc.Core.Fluent;
 
 [PublicAPI]
 public interface IHtmlPagerBuilder
diff --git a/src/X.PagedList.Mvc.Core/GoToFormRenderOptions.cs b/src/X.PagedList.Mvc.Core/GoToFormRenderOptions.cs
@@ -1,4 +1,4 @@
-﻿namespace X.Web.PagedList;
+﻿namespace X.PagedList.Mvc.Core;
 
 ///<summary>
 /// Options for configuring the output of <see cref = "HtmlHelper" />.
diff --git a/src/X.PagedList.Mvc.Core/HtmlHelper.cs b/src/X.PagedList.Mvc.Core/HtmlHelper.cs
@@ -4,9 +4,8 @@
 using System.Linq;
 using System.Text;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using X.PagedList;
 
-namespace X.Web.PagedList;
+namespace X.PagedList.Mvc.Core;
 
 public class HtmlHelper
 {
diff --git a/src/X.PagedList.Mvc.Core/HtmlHelperExtension.cs b/src/X.PagedList.Mvc.Core/HtmlHelperExtension.cs
@@ -3,9 +3,8 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using X.PagedList;
 
-namespace X.Web.PagedList;
+namespace X.PagedList.Mvc.Core;
 
 ///<summary>
 ///	Extension methods for generating paging controls that can operate on instances of IPagedList.
diff --git a/src/X.PagedList.Mvc.Core/ItemSliceAndTotalPosition.cs b/src/X.PagedList.Mvc.Core/ItemSliceAndTotalPosition.cs
@@ -1,4 +1,4 @@
-﻿namespace X.Web.PagedList;
+﻿namespace X.PagedList.Mvc.Core;
 
 /// <summary>
 /// A two-state enum that controls the position of ItemSliceAndTotal text within PagedList items.
diff --git a/src/X.PagedList.Mvc.Core/PagedListDisplayMode.cs b/src/X.PagedList.Mvc.Core/PagedListDisplayMode.cs
@@ -1,4 +1,4 @@
-﻿namespace X.Web.PagedList;
+﻿namespace X.PagedList.Mvc.Core;
 
 /// <summary>
 /// A tri-state enum that controls the visibility of portions of the PagedList paging control.
diff --git a/src/X.PagedList.Mvc.Core/PagedListRenderOptions.cs b/src/X.PagedList.Mvc.Core/PagedListRenderOptions.cs
@@ -4,7 +4,7 @@
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace X.Web.PagedList;
+namespace X.PagedList.Mvc.Core;
 
 public class PagedListRenderOptions
 {
diff --git a/src/X.PagedList.Mvc.Core/README.md b/src/X.PagedList.Mvc.Core/README.md
@@ -1,17 +1,18 @@
-# X.PagedList.Mvc.Core
+# X.Web.PagedList
 
-The X.PagedList.Mvc.Core library is a tool designed for ASP.NET Core applications that facilitates pagination of
-collections like IEnumerable and IQueryable.
-
-## Important announcement
-In a continuous effort to enhance library quality and support, this package has been migrated to X.Web.PagedList.
+[![NuGet Version](http://img.shields.io/nuget/v/X.Web.PagedList.svg?style=flat)](https://www.nuget.org/packages/X.Web.PagedList/)
+[![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/andrew_gubskiy.svg?style=social&label=Follow%20me!)](https://twitter.com/intent/user?screen_name=andrew_gubskiy)
 
-From now on, please use [X.Web.PagedList](https://www.nuget.org/packages/X.Web.PagedList/) instead of this package.
 
-It's important to note that you must update your code to use the `X.PagedList` namespace instead of `X.PagedList.Mvc.Core`.
+## What is this?
+The X.PagedList.Mvc.Core library is a tool designed for ASP.NET Core applications that facilitates pagination of 
+collections like IEnumerable and IQueryable.
 
 ## How to use
 You can find all information about how to use X.PagedList libraries in [Wiki](https://github.com/dncuug/X.PagedList/wiki)
 
 ## License
-Licensed under the [MIT License](https://github.com/dncuug/X.PagedList/blob/master/LICENSE).
+Licensed under the [MIT License](https://github.com/dncuug/X.PagedList/blob/master/LICENSE).
+
+## Get a digital subscription for project news
+[Subscribe](https://twitter.com/intent/user?screen_name=andrew_gubskiy) to my Twitter to keep up-to-date with project news and receive announcements.
diff --git a/src/X.PagedList.Mvc.Core/TagBuilderExtensions.cs b/src/X.PagedList.Mvc.Core/TagBuilderExtensions.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace X.Web.PagedList;
+namespace X.PagedList.Mvc.Core;
 
 [PublicAPI]
 public static class TagBuilderExtensions
diff --git a/src/X.PagedList.Mvc.Core/TagBuilderFactory.cs b/src/X.PagedList.Mvc.Core/TagBuilderFactory.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace X.Web.PagedList;
+namespace X.PagedList.Mvc.Core;
 
 public interface ITagBuilderFactory
 {
diff --git a/src/X.PagedList.Mvc.Core/X.PagedList.Mvc.Core.csproj b/src/X.PagedList.Mvc.Core/X.PagedList.Mvc.Core.csproj
diff --git a/src/X.PagedList.Mvc.Core/icon.png b/src/X.PagedList.Mvc.Core/icon.png
diff --git a/src/X.Web.PagedList/README.md b/src/X.Web.PagedList/README.md
diff --git a/src/X.Web.PagedList/X.Web.PagedList.csproj b/src/X.Web.PagedList/X.Web.PagedList.csproj
diff --git a/x-extensions.png b/x-extensions.png
diff --git a/x-pagedlist.png b/x-pagedlist.png
diff --git a/x-web.png b/x-web.png

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`@using X.PagedList;`
`7`		`-@using X.Web.PagedList`
	`7`	`+@using X.PagedList.Mvc.Core`
`8`	`8`	`@import this so we can cast our list to IPagedList (only necessary because ViewBag is dynamic)@`
`9`	`9`
`10`	`10`	`<!-- import the included stylesheet for some (very basic) default styling -->`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`@using X.PagedList;`
`7`		`-@using X.Web.PagedList`
`8`		`-@using X.Web.PagedList.Fluent`
	`7`	`+@using X.PagedList.Mvc.Core`
	`8`	`+@using X.PagedList.Mvc.Core.Fluent`
`9`	`9`	`@import this so we can cast our list to IPagedList (only necessary because ViewBag is dynamic)@`
`10`	`10`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`
`3`		`-namespace X.Web.PagedList;`
	`3`	`+namespace X.PagedList.Mvc.Core;`
`4`	`4`
`5`	`5`	`public class AjaxOptions`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Microsoft.AspNetCore.Html;`
`3`	`3`	`using Microsoft.AspNetCore.Mvc.Rendering;`
`4`		`-using X.PagedList;`
`5`	`4`
`6`		`-namespace X.Web.PagedList.Fluent;`
	`5`	`+namespace X.PagedList.Mvc.Core.Fluent;`
`7`	`6`
`8`	`7`	`internal sealed class HtmlPagerBuilder : IHtmlPagerBuilder`
`9`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace X.Web.PagedList;`
	`1`	`+namespace X.PagedList.Mvc.Core;`
`2`	`2`
`3`	`3`	`///<summary>`
`4`	`4`	`/// Options for configuring the output of <see cref = "HtmlHelper" />.`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,8 @@`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Text;`
`6`	`6`	`using Microsoft.AspNetCore.Mvc.Rendering;`
`7`		`-using X.PagedList;`
`8`	`7`
`9`		`-namespace X.Web.PagedList;`
	`8`	`+namespace X.PagedList.Mvc.Core;`
`10`	`9`
`11`	`10`	`public class HtmlHelper`
`12`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Text.Encodings.Web;`
`5`	`5`	`using Microsoft.AspNetCore.Mvc.Rendering;`
`6`	`6`
`7`		`-namespace X.Web.PagedList;`
	`7`	`+namespace X.PagedList.Mvc.Core;`
`8`	`8`
`9`	`9`	`public class PagedListRenderOptions`
`10`	`10`	`{`