Move X.PagedList.Mvc.Core to X.Web.PagedList

a-gubskiy · a-gubskiy · commit 8ec71492d233 · 2024-08-01T10:25:48.000+03:00
diff --git a/X.PagedList.sln b/X.PagedList.sln
@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{30
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.PagedList", "src\X.PagedList\X.PagedList.csproj", "{49F86DF5-728F-4F22-986E-38DFC9C2432A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.PagedList.Mvc.Core", "src\X.PagedList.Mvc.Core\X.PagedList.Mvc.Core.csproj", "{3FB17E16-B671-450F-81BD-FD607D6A78C4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.Web.PagedList", "src\X.Web.PagedList\X.Web.PagedList.csproj", "{3FB17E16-B671-450F-81BD-FD607D6A78C4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.PagedList.Tests", "tests\X.PagedList.Tests\X.PagedList.Tests.csproj", "{C78B1316-1EF9-45C3-A3FD-9A131BA3DD62}"
 EndProject
diff --git a/examples/Example.Website/Controllers/HomeController.cs b/examples/Example.Website/Controllers/HomeController.cs
@@ -1,10 +1,7 @@
 ﻿using Example.DAL;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using X.PagedList;
-using X.PagedList.Extensions;
 
 namespace Example.Website.Controllers;
 
diff --git a/examples/Example.Website/Example.Website.csproj b/examples/Example.Website/Example.Website.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\src\X.PagedList.EF\X.PagedList.EF.csproj"/>
-        <ProjectReference Include="..\..\src\X.PagedList.Mvc.Core\X.PagedList.Mvc.Core.csproj"/>
+        <ProjectReference Include="..\..\src\X.Web.PagedList\X.Web.PagedList.csproj" />
         <ProjectReference Include="..\..\src\X.PagedList\X.PagedList.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
@@ -3,8 +3,8 @@
     ViewBag.Title = "Product Listing";
 }
 
-@using X.PagedList.Mvc.Core; @*import this so we get our HTML Helper*@
 @using X.PagedList;
+@using X.Web.PagedList
 @*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
@@ -3,10 +3,10 @@
     var pagedList = (IPagedList)ViewBag.Names;
 }
 
-@using X.PagedList.Mvc.Core; @*import this so we get our HTML Helper*@
 @using X.PagedList;
+@using X.Web.PagedList
+@using X.Web.PagedList.Fluent
 @*import this so we can cast our list to IPagedList (only necessary because ViewBag is dynamic)*@
-@using X.PagedList.Mvc.Core.Fluent
 
 
 <!-- import the included stylesheet for some (very basic) default styling -->
diff --git a/examples/Example.Website/Views/Home/Index.cshtml b/examples/Example.Website/Views/Home/Index.cshtml
@@ -3,10 +3,10 @@
     var pagedList = (IPagedList)ViewBag.Names;
 }
 
-@using X.PagedList.Mvc.Core; @*import this so we get our HTML Helper*@
 @using X.PagedList;
+@using X.Web.PagedList
+@using X.Web.PagedList.Fluent
 @*import this so we can cast our list to IPagedList (only necessary because ViewBag is dynamic)*@
-@using X.PagedList.Mvc.Core.Fluent
 
 
 <!-- import the included stylesheet for some (very basic) default styling -->
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.PagedList.Mvc.Core
+@using X.Web.PagedList
 
 @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.PagedList.Mvc.Core
+@using X.Web.PagedList
 
 @model X.PagedList.IPagedList
 
diff --git a/examples/Example.Website/Views/_ViewImports.cshtml b/examples/Example.Website/Views/_ViewImports.cshtml
@@ -1,2 +1 @@
-﻿@using Example.Website
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+﻿@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/X.PagedList/PagedListExtensions.cs b/src/X.PagedList/PagedListExtensions.cs
@@ -1,10 +1,10 @@
-﻿using JetBrains.Annotations;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using JetBrains.Annotations;
 
-namespace X.PagedList.Extensions;
+namespace X.PagedList;
 
 /// <summary>
 /// Container for extension methods designed to simplify the creation of instances of <see cref="PagedList{T}"/>.
diff --git a/src/X.Web.PagedList/AjaxOptions.cs b/src/X.Web.PagedList/AjaxOptions.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace X.PagedList.Mvc.Core;
+namespace X.Web.PagedList;
 
 public class AjaxOptions
 {
diff --git a/src/X.Web.PagedList/Fluent/HtmlPagerBuilder.cs b/src/X.Web.PagedList/Fluent/HtmlPagerBuilder.cs
@@ -1,8 +1,9 @@
 ﻿using System;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using X.PagedList;
 
-namespace X.PagedList.Mvc.Core.Fluent;
+namespace X.Web.PagedList.Fluent;
 
 internal sealed class HtmlPagerBuilder : IHtmlPagerBuilder
 {
diff --git a/src/X.Web.PagedList/Fluent/HtmlPagerExtensions.cs b/src/X.Web.PagedList/Fluent/HtmlPagerExtensions.cs
@@ -1,10 +1,10 @@
-﻿using JetBrains.Annotations;
+﻿using System.Linq;
+using JetBrains.Annotations;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Linq;
-using X.PagedList.Extensions;
+using X.PagedList;
 
-namespace X.PagedList.Mvc.Core.Fluent;
+namespace X.Web.PagedList.Fluent;
 
 [PublicAPI]
 public static class HtmlPagerExtensions
diff --git a/src/X.Web.PagedList/Fluent/IHtmlPagerBuilder.cs b/src/X.Web.PagedList/Fluent/IHtmlPagerBuilder.cs
@@ -2,7 +2,7 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Html;
 
-namespace X.PagedList.Mvc.Core.Fluent;
+namespace X.Web.PagedList.Fluent;
 
 [PublicAPI]
 public interface IHtmlPagerBuilder
diff --git a/src/X.Web.PagedList/GoToFormRenderOptions.cs b/src/X.Web.PagedList/GoToFormRenderOptions.cs
@@ -1,6 +1,4 @@
-﻿using System;
-
-namespace X.PagedList.Mvc.Core;
+﻿namespace X.Web.PagedList;
 
 ///<summary>
 /// Options for configuring the output of <see cref = "HtmlHelper" />.
diff --git a/src/X.Web.PagedList/HtmlHelper.cs b/src/X.Web.PagedList/HtmlHelper.cs
@@ -4,8 +4,9 @@
 using System.Linq;
 using System.Text;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using X.PagedList;
 
-namespace X.PagedList.Mvc.Core;
+namespace X.Web.PagedList;
 
 public class HtmlHelper
 {
diff --git a/src/X.Web.PagedList/HtmlHelperExtension.cs b/src/X.Web.PagedList/HtmlHelperExtension.cs
@@ -3,8 +3,9 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using X.PagedList;
 
-namespace X.PagedList.Mvc.Core;
+namespace X.Web.PagedList;
 
 ///<summary>
 ///	Extension methods for generating paging controls that can operate on instances of IPagedList.
diff --git a/src/X.Web.PagedList/ItemSliceAndTotalPosition.cs b/src/X.Web.PagedList/ItemSliceAndTotalPosition.cs
@@ -1,4 +1,4 @@
-﻿namespace X.PagedList.Mvc.Core;
+﻿namespace X.Web.PagedList;
 
 /// <summary>
 /// A two-state enum that controls the position of ItemSliceAndTotal text within PagedList items.
diff --git a/src/X.Web.PagedList/PagedListDisplayMode.cs b/src/X.Web.PagedList/PagedListDisplayMode.cs
@@ -1,4 +1,4 @@
-﻿namespace X.PagedList.Mvc.Core;
+﻿namespace X.Web.PagedList;
 
 /// <summary>
 /// A tri-state enum that controls the visibility of portions of the PagedList paging control.
diff --git a/src/X.Web.PagedList/PagedListRenderOptions.cs b/src/X.Web.PagedList/PagedListRenderOptions.cs
@@ -4,7 +4,7 @@
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace X.PagedList.Mvc.Core;
+namespace X.Web.PagedList;
 
 public class PagedListRenderOptions
 {
diff --git a/src/X.Web.PagedList/README.md b/src/X.Web.PagedList/README.md
diff --git a/src/X.Web.PagedList/TagBuilderExtensions.cs b/src/X.Web.PagedList/TagBuilderExtensions.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace X.PagedList.Mvc.Core;
+namespace X.Web.PagedList;
 
 [PublicAPI]
 public static class TagBuilderExtensions
diff --git a/src/X.Web.PagedList/TagBuilderFactory.cs b/src/X.Web.PagedList/TagBuilderFactory.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace X.PagedList.Mvc.Core;
+namespace X.Web.PagedList;
 
 public interface ITagBuilderFactory
 {
diff --git a/src/X.Web.PagedList/X.Web.PagedList.csproj b/src/X.Web.PagedList/X.Web.PagedList.csproj
diff --git a/src/X.Web.PagedList/icon.png b/src/X.Web.PagedList/icon.png
diff --git a/src/X.Web.PagedList/xpagedlist.snk b/src/X.Web.PagedList/xpagedlist.snk
diff --git a/tests/X.PagedList.Tests/PagedListExample.cs b/tests/X.PagedList.Tests/PagedListExample.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Linq;
-using X.PagedList.Extensions;
 
 namespace X.PagedList.Tests;
 
diff --git a/tests/X.PagedList.Tests/PagedListFacts.cs b/tests/X.PagedList.Tests/PagedListFacts.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using X.PagedList.Extensions;
 using Xunit;
 
 namespace X.PagedList.Tests;
diff --git a/tests/X.PagedList.Tests/PagedListTheories.cs b/tests/X.PagedList.Tests/PagedListTheories.cs
@@ -1,6 +1,5 @@
 ﻿using AutoFixture;
 using System.Linq;
-using X.PagedList.Extensions;
 using Xunit;
 
 namespace X.PagedList.Tests;
diff --git a/tests/X.PagedList.Tests/SplitAndPartitionFacts.cs b/tests/X.PagedList.Tests/SplitAndPartitionFacts.cs
@@ -1,5 +1,4 @@
 ﻿using System.Linq;
-using X.PagedList.Extensions;
 using Xunit;
 
 namespace X.PagedList.Tests;

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`ViewBag.Title = "Product Listing";`
`4`	`4`	`}`
`5`	`5`
`6`		`-@using X.PagedList.Mvc.Core; @import this so we get our HTML Helper@`
`7`	`6`	`@using X.PagedList;`
	`7`	`+@using X.Web.PagedList`
`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
`@@ -1,2 +1 @@`
`1`		`-@using Example.Website`
`2`		`-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers`
	`1`	`+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers`
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.PagedList.Mvc.Core;`
	`3`	`+namespace X.Web.PagedList;`
`4`	`4`
`5`	`5`	`public class AjaxOptions`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Microsoft.AspNetCore.Html;`
`3`	`3`	`using Microsoft.AspNetCore.Mvc.Rendering;`
	`4`	`+using X.PagedList;`
`4`	`5`
`5`		`-namespace X.PagedList.Mvc.Core.Fluent;`
	`6`	`+namespace X.Web.PagedList.Fluent;`
`6`	`7`
`7`	`8`	`internal sealed class HtmlPagerBuilder : IHtmlPagerBuilder`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Text;`
`6`	`6`	`using Microsoft.AspNetCore.Mvc.Rendering;`
	`7`	`+using X.PagedList;`
`7`	`8`
`8`		`-namespace X.PagedList.Mvc.Core;`
	`9`	`+namespace X.Web.PagedList;`
`9`	`10`
`10`	`11`	`public class HtmlHelper`
`11`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace X.PagedList.Mvc.Core;`
	`1`	`+namespace X.Web.PagedList;`
`2`	`2`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// A two-state enum that controls the position of ItemSliceAndTotal text within PagedList items.`
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.PagedList.Mvc.Core;`
	`7`	`+namespace X.Web.PagedList;`
`8`	`8`
`9`	`9`	`public class PagedListRenderOptions`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Linq;`
`2`		`-using X.PagedList.Extensions;`
`3`	`2`	`using Xunit;`
`4`	`3`
`5`	`4`	`namespace X.PagedList.Tests;`