Skip to content

Commit 44d5ea0

Browse files
authored
Merge pull request #284 from dncuug/namespace-update-stage-1
Namespace update. Stage 1
2 parents 3744dde + 6e535d5 commit 44d5ea0

35 files changed

+110
-54
lines changed

X.PagedList.sln

+8-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{30
1414
EndProject
1515
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.PagedList", "src\X.PagedList\X.PagedList.csproj", "{49F86DF5-728F-4F22-986E-38DFC9C2432A}"
1616
EndProject
17-
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}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.Web.PagedList", "src\X.Web.PagedList\X.Web.PagedList.csproj", "{3FB17E16-B671-450F-81BD-FD607D6A78C4}"
1818
EndProject
1919
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.PagedList.Tests", "tests\X.PagedList.Tests\X.PagedList.Tests.csproj", "{C78B1316-1EF9-45C3-A3FD-9A131BA3DD62}"
2020
EndProject
@@ -24,6 +24,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.DAL", "examples\Exa
2424
EndProject
2525
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.PagedList.EF", "src\X.PagedList.EF\X.PagedList.EF.csproj", "{1934BC10-30AE-4C4C-AF22-E444B1F70ACA}"
2626
EndProject
27+
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}"
28+
EndProject
2729
Global
2830
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2931
Debug|Any CPU = Debug|Any CPU
@@ -54,6 +56,10 @@ Global
5456
{1934BC10-30AE-4C4C-AF22-E444B1F70ACA}.Debug|Any CPU.Build.0 = Debug|Any CPU
5557
{1934BC10-30AE-4C4C-AF22-E444B1F70ACA}.Release|Any CPU.ActiveCfg = Release|Any CPU
5658
{1934BC10-30AE-4C4C-AF22-E444B1F70ACA}.Release|Any CPU.Build.0 = Release|Any CPU
59+
{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60+
{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
61+
{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
62+
{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE}.Release|Any CPU.Build.0 = Release|Any CPU
5763
EndGlobalSection
5864
GlobalSection(SolutionProperties) = preSolution
5965
HideSolutionNode = FALSE
@@ -65,6 +71,7 @@ Global
6571
{288F5726-904F-48B8-8363-EA1A22D331D1} = {309A8FC8-4784-4D8D-903F-BD54EBB0F1D7}
6672
{AD16A8D1-EAF0-4947-BCEC-A8B423B2F117} = {309A8FC8-4784-4D8D-903F-BD54EBB0F1D7}
6773
{1934BC10-30AE-4C4C-AF22-E444B1F70ACA} = {BDDADD09-D112-418E-8469-BC762EC09936}
74+
{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE} = {BDDADD09-D112-418E-8469-BC762EC09936}
6875
EndGlobalSection
6976
GlobalSection(ExtensibilityGlobals) = postSolution
7077
SolutionGuid = {1A82D446-6F26-48B2-8085-DFA5F87453FC}

examples/Example.Website/Controllers/HomeController.cs

-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
using Example.DAL;
22
using Microsoft.AspNetCore.Mvc;
33
using System.Collections.Generic;
4-
using System.Linq;
5-
using System.Threading.Tasks;
64
using X.PagedList;
7-
using X.PagedList.Extensions;
85

96
namespace Example.Website.Controllers;
107

examples/Example.Website/Example.Website.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
<ItemGroup>
99
<ProjectReference Include="..\..\src\X.PagedList.EF\X.PagedList.EF.csproj"/>
10-
<ProjectReference Include="..\..\src\X.PagedList.Mvc.Core\X.PagedList.Mvc.Core.csproj"/>
1110
<ProjectReference Include="..\..\src\X.PagedList\X.PagedList.csproj"/>
11+
<ProjectReference Include="..\..\src\X.Web.PagedList\X.Web.PagedList.csproj" />
1212
<ProjectReference Include="..\Example.DAL\Example.DAL.csproj"/>
1313
</ItemGroup>
1414

examples/Example.Website/Views/Bootstrap41/Index.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
ViewBag.Title = "Product Listing";
44
}
55

6-
@using X.PagedList.Mvc.Core; @*import this so we get our HTML Helper*@
76
@using X.PagedList;
7+
@using X.Web.PagedList
88
@*import this so we can cast our list to IPagedList (only necessary because ViewBag is dynamic)*@
99

1010
<!-- import the included stylesheet for some (very basic) default styling -->

examples/Example.Website/Views/EF/Index.cshtml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
var pagedList = (IPagedList)ViewBag.Names;
44
}
55

6-
@using X.PagedList.Mvc.Core; @*import this so we get our HTML Helper*@
76
@using X.PagedList;
7+
@using X.Web.PagedList
8+
@using X.Web.PagedList.Fluent
89
@*import this so we can cast our list to IPagedList (only necessary because ViewBag is dynamic)*@
9-
@using X.PagedList.Mvc.Core.Fluent
1010

1111

1212
<!-- import the included stylesheet for some (very basic) default styling -->

examples/Example.Website/Views/Home/Index.cshtml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
var pagedList = (IPagedList)ViewBag.Names;
44
}
55

6-
@using X.PagedList.Mvc.Core; @*import this so we get our HTML Helper*@
76
@using X.PagedList;
7+
@using X.Web.PagedList
8+
@using X.Web.PagedList.Fluent
89
@*import this so we can cast our list to IPagedList (only necessary because ViewBag is dynamic)*@
9-
@using X.PagedList.Mvc.Core.Fluent
1010

1111

1212
<!-- import the included stylesheet for some (very basic) default styling -->

examples/Example.Website/Views/Shared/Paging/_Pager.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@using System.Text
2-
@using X.PagedList.Mvc.Core
2+
@using X.Web.PagedList
33

44
@model X.PagedList.IPagedList
55

examples/Example.Website/Views/Shared/Paging/_Pager_85.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@using System.Text
2-
@using X.PagedList.Mvc.Core
2+
@using X.Web.PagedList
33

44
@model X.PagedList.IPagedList
55

Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
@using Example.Website
2-
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
1+
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

src/Directory.Build.props

+5-6
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@
55

66
<PackageReadmeFile>README.md</PackageReadmeFile>
77
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
8-
<PackageIconUrl>https://ru.gravatar.com/userimage/8071071/f2dc08ee7e4016451f64a7ae9cffd110.png?size=200</PackageIconUrl>
98

109
<Authors>Troy Goode, Andrew Gubskiy</Authors>
1110
<Copyright>Andrew Gubskiy © 2024</Copyright>
1211
<Company>Ukrainian .NET Developer Community</Company>
1312

14-
<Version>10.0.3</Version>
15-
<AssemblyVersion>10.0.3</AssemblyVersion>
16-
<FileVersion>10.0.3</FileVersion>
17-
<PackageVersion>10.0.3</PackageVersion>
13+
<Version>10.1.2</Version>
14+
<AssemblyVersion>10.1.2</AssemblyVersion>
15+
<FileVersion>10.1.2</FileVersion>
16+
<PackageVersion>10.1.2</PackageVersion>
1817

1918
<RepositoryType>git</RepositoryType>
2019
<RepositoryUrl>https://github.com/dncuug/X.PagedList.git</RepositoryUrl>
21-
<PackageProjectUrl>https://github.com/dncuug/X.PagedList</PackageProjectUrl>
20+
<PackageProjectUrl>https://andrew.gubskiy.com/open-source</PackageProjectUrl>
2221

2322
<SignAssembly>true</SignAssembly>
2423
<AssemblyOriginatorKeyFile>xpagedlist.snk</AssemblyOriginatorKeyFile>

src/X.PagedList.Mvc.Core/README.md

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
# X.PagedList.Mvc.Core
22

3-
[![NuGet Version](http://img.shields.io/nuget/v/X.PagedList.Mvc.Core.svg?style=flat)](https://www.nuget.org/packages/X.PagedList.Mvc.Core/)
4-
[![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)
3+
The X.PagedList.Mvc.Core library is a tool designed for ASP.NET Core applications that facilitates pagination of
4+
collections like IEnumerable and IQueryable.
55

6+
## Important announcement
7+
In a continuous effort to enhance library quality and support, this package has been migrated to X.Web.PagedList.
68

7-
## What is this?
8-
The X.PagedList.Mvc.Core library is a tool designed for ASP.NET Core applications that facilitates pagination of
9-
collections like IEnumerable and IQueryable.
9+
From now on, please use [X.Web.PagedList](https://www.nuget.org/packages/X.Web.PagedList/) instead of this package.
10+
11+
It's important to note that you must update your code to use the `X.PagedList` namespace instead of `X.PagedList.Mvc.Core`.
1012

1113
## How to use
1214
You can find all information about how to use X.PagedList libraries in [Wiki](https://github.com/dncuug/X.PagedList/wiki)
1315

1416
## License
15-
Licensed under the [MIT License](https://github.com/dncuug/X.PagedList/blob/master/LICENSE).
16-
17-
## Get a digital subscription for project news
18-
[Subscribe](https://twitter.com/intent/user?screen_name=andrew_gubskiy) to my Twitter to keep up-to-date with project news and receive announcements.
17+
Licensed under the [MIT License](https://github.com/dncuug/X.PagedList/blob/master/LICENSE).

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
99

1010
<PackageTags>paging pagedlist paged list web mvc</PackageTags>
11+
<PackageIcon>x-web.png</PackageIcon>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
@@ -18,13 +19,16 @@
1819
<None Include="../../LICENSE.md" Pack="true" PackagePath="" />
1920
</ItemGroup>
2021

22+
<ItemGroup>
23+
<None Include="../../x-web.png" Pack="True" PackagePath=""/>
24+
</ItemGroup>
25+
2126
<ItemGroup>
2227
<FrameworkReference Include="Microsoft.AspNetCore.App" />
23-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="all" />
2428
</ItemGroup>
2529

2630
<ItemGroup>
27-
<ProjectReference Include="..\X.PagedList\X.PagedList.csproj" />
31+
<ProjectReference Include="..\X.Web.PagedList\X.Web.PagedList.csproj" />
2832
</ItemGroup>
2933

3034
</Project>

src/X.PagedList/PagedListExtensions.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using JetBrains.Annotations;
2-
using System;
1+
using System;
32
using System.Collections.Generic;
43
using System.Linq;
54
using System.Linq.Expressions;
5+
using JetBrains.Annotations;
66

7-
namespace X.PagedList.Extensions;
7+
namespace X.PagedList;
88

99
/// <summary>
1010
/// Container for extension methods designed to simplify the creation of instances of <see cref="PagedList{T}"/>.

src/X.PagedList.Mvc.Core/AjaxOptions.cs src/X.Web.PagedList/AjaxOptions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
22

3-
namespace X.PagedList.Mvc.Core;
3+
namespace X.Web.PagedList;
44

55
public class AjaxOptions
66
{

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
using System;
22
using Microsoft.AspNetCore.Html;
33
using Microsoft.AspNetCore.Mvc.Rendering;
4+
using X.PagedList;
45

5-
namespace X.PagedList.Mvc.Core.Fluent;
6+
namespace X.Web.PagedList.Fluent;
67

78
internal sealed class HtmlPagerBuilder : IHtmlPagerBuilder
89
{

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
using JetBrains.Annotations;
1+
using System.Linq;
2+
using JetBrains.Annotations;
23
using Microsoft.AspNetCore.Html;
34
using Microsoft.AspNetCore.Mvc.Rendering;
4-
using System.Linq;
5+
using X.PagedList;
56
using X.PagedList.Extensions;
67

7-
namespace X.PagedList.Mvc.Core.Fluent;
8+
namespace X.Web.PagedList.Fluent;
89

910
[PublicAPI]
1011
public static class HtmlPagerExtensions

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using JetBrains.Annotations;
33
using Microsoft.AspNetCore.Html;
44

5-
namespace X.PagedList.Mvc.Core.Fluent;
5+
namespace X.Web.PagedList.Fluent;
66

77
[PublicAPI]
88
public interface IHtmlPagerBuilder

src/X.PagedList.Mvc.Core/GoToFormRenderOptions.cs src/X.Web.PagedList/GoToFormRenderOptions.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
2-
3-
namespace X.PagedList.Mvc.Core;
1+
namespace X.Web.PagedList;
42

53
///<summary>
64
/// Options for configuring the output of <see cref = "HtmlHelper" />.

src/X.PagedList.Mvc.Core/HtmlHelper.cs src/X.Web.PagedList/HtmlHelper.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
using System.Linq;
55
using System.Text;
66
using Microsoft.AspNetCore.Mvc.Rendering;
7+
using X.PagedList;
78

8-
namespace X.PagedList.Mvc.Core;
9+
namespace X.Web.PagedList;
910

1011
public class HtmlHelper
1112
{

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
using JetBrains.Annotations;
44
using Microsoft.AspNetCore.Html;
55
using Microsoft.AspNetCore.Mvc.Rendering;
6+
using X.PagedList;
67

7-
namespace X.PagedList.Mvc.Core;
8+
namespace X.Web.PagedList;
89

910
///<summary>
1011
/// Extension methods for generating paging controls that can operate on instances of IPagedList.

src/X.PagedList.Mvc.Core/ItemSliceAndTotalPosition.cs src/X.Web.PagedList/ItemSliceAndTotalPosition.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace X.PagedList.Mvc.Core;
1+
namespace X.Web.PagedList;
22

33
/// <summary>
44
/// A two-state enum that controls the position of ItemSliceAndTotal text within PagedList items.

src/X.PagedList.Mvc.Core/PagedListDisplayMode.cs src/X.Web.PagedList/PagedListDisplayMode.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace X.PagedList.Mvc.Core;
1+
namespace X.Web.PagedList;
22

33
/// <summary>
44
/// A tri-state enum that controls the visibility of portions of the PagedList paging control.

src/X.PagedList.Mvc.Core/PagedListRenderOptions.cs src/X.Web.PagedList/PagedListRenderOptions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Text.Encodings.Web;
55
using Microsoft.AspNetCore.Mvc.Rendering;
66

7-
namespace X.PagedList.Mvc.Core;
7+
namespace X.Web.PagedList;
88

99
public class PagedListRenderOptions
1010
{

src/X.Web.PagedList/README.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# X.Web.PagedList
2+
3+
[![NuGet Version](http://img.shields.io/nuget/v/X.Web.PagedList.svg?style=flat)](https://www.nuget.org/packages/X.Web.PagedList/)
4+
[![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)
5+
6+
7+
## What is this?
8+
The X.PagedList.Mvc.Core library is a tool designed for ASP.NET Core applications that facilitates pagination of
9+
collections like IEnumerable and IQueryable.
10+
11+
## How to use
12+
You can find all information about how to use X.PagedList libraries in [Wiki](https://github.com/dncuug/X.PagedList/wiki)
13+
14+
## License
15+
Licensed under the [MIT License](https://github.com/dncuug/X.PagedList/blob/master/LICENSE).
16+
17+
## Get a digital subscription for project news
18+
[Subscribe](https://twitter.com/intent/user?screen_name=andrew_gubskiy) to my Twitter to keep up-to-date with project news and receive announcements.

src/X.PagedList.Mvc.Core/TagBuilderExtensions.cs src/X.Web.PagedList/TagBuilderExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Microsoft.AspNetCore.Html;
55
using Microsoft.AspNetCore.Mvc.Rendering;
66

7-
namespace X.PagedList.Mvc.Core;
7+
namespace X.Web.PagedList;
88

99
[PublicAPI]
1010
public static class TagBuilderExtensions

src/X.PagedList.Mvc.Core/TagBuilderFactory.cs src/X.Web.PagedList/TagBuilderFactory.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.AspNetCore.Mvc.Rendering;
22

3-
namespace X.PagedList.Mvc.Core;
3+
namespace X.Web.PagedList;
44

55
public interface ITagBuilderFactory
66
{
+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Title>X.Web.PagedList</Title>
5+
<Description>ASP.NET Core extensions for implementing paging in web applications.</Description>
6+
7+
<LangVersion>default</LangVersion>
8+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
9+
10+
<PackageTags>paging pagedlist paged list web mvc</PackageTags>
11+
<PackageIcon>x-web.png</PackageIcon>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<None Include="README.md" Pack="true" PackagePath="" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<None Include="../../LICENSE.md" Pack="true" PackagePath="" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<None Include="../../x-web.png" Pack="True" PackagePath=""/>
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
28+
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="all" />
29+
</ItemGroup>
30+
31+
<ItemGroup>
32+
<ProjectReference Include="..\X.PagedList\X.PagedList.csproj" />
33+
</ItemGroup>
34+
35+
</Project>
File renamed without changes.

src/X.Web.PagedList/xpagedlist.snk

596 Bytes
Binary file not shown.

tests/X.PagedList.Tests/PagedListExample.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Linq;
3-
using X.PagedList.Extensions;
43

54
namespace X.PagedList.Tests;
65

tests/X.PagedList.Tests/PagedListFacts.cs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Collections.Generic;
44
using System.Linq;
55
using System.Linq.Expressions;
6-
using X.PagedList.Extensions;
76
using Xunit;
87

98
namespace X.PagedList.Tests;

tests/X.PagedList.Tests/PagedListTheories.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using AutoFixture;
22
using System.Linq;
3-
using X.PagedList.Extensions;
43
using Xunit;
54

65
namespace X.PagedList.Tests;

0 commit comments

Comments
 (0)