Skip to content

Commit

Permalink
Merge pull request #284 from dncuug/namespace-update-stage-1
Browse files Browse the repository at this point in the history
Namespace update. Stage 1
  • Loading branch information
ernado-x authored Aug 1, 2024
2 parents 3744dde + 6e535d5 commit 44d5ea0
Show file tree
Hide file tree
Showing 35 changed files with 110 additions and 54 deletions.
9 changes: 8 additions & 1 deletion X.PagedList.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,6 +24,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.DAL", "examples\Exa
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.PagedList.EF", "src\X.PagedList.EF\X.PagedList.EF.csproj", "{1934BC10-30AE-4C4C-AF22-E444B1F70ACA}"
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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -54,6 +56,10 @@ Global
{1934BC10-30AE-4C4C-AF22-E444B1F70ACA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1934BC10-30AE-4C4C-AF22-E444B1F70ACA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1934BC10-30AE-4C4C-AF22-E444B1F70ACA}.Release|Any CPU.Build.0 = Release|Any CPU
{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -65,6 +71,7 @@ Global
{288F5726-904F-48B8-8363-EA1A22D331D1} = {309A8FC8-4784-4D8D-903F-BD54EBB0F1D7}
{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}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1A82D446-6F26-48B2-8085-DFA5F87453FC}
Expand Down
3 changes: 0 additions & 3 deletions examples/Example.Website/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion examples/Example.Website/Example.Website.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

<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.PagedList\X.PagedList.csproj"/>
<ProjectReference Include="..\..\src\X.Web.PagedList\X.Web.PagedList.csproj" />
<ProjectReference Include="..\Example.DAL\Example.DAL.csproj"/>
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/Example.Website/Views/Bootstrap41/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
4 changes: 2 additions & 2 deletions examples/Example.Website/Views/EF/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
4 changes: 2 additions & 2 deletions examples/Example.Website/Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion examples/Example.Website/Views/Shared/Paging/_Pager.cshtml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using System.Text
@using X.PagedList.Mvc.Core
@using X.Web.PagedList

@model X.PagedList.IPagedList

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using System.Text
@using X.PagedList.Mvc.Core
@using X.Web.PagedList

@model X.PagedList.IPagedList

Expand Down
3 changes: 1 addition & 2 deletions examples/Example.Website/Views/_ViewImports.cshtml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
@using Example.Website
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
11 changes: 5 additions & 6 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@

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

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

<Version>10.0.3</Version>
<AssemblyVersion>10.0.3</AssemblyVersion>
<FileVersion>10.0.3</FileVersion>
<PackageVersion>10.0.3</PackageVersion>
<Version>10.1.2</Version>
<AssemblyVersion>10.1.2</AssemblyVersion>
<FileVersion>10.1.2</FileVersion>
<PackageVersion>10.1.2</PackageVersion>

<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/dncuug/X.PagedList.git</RepositoryUrl>
<PackageProjectUrl>https://github.com/dncuug/X.PagedList</PackageProjectUrl>
<PackageProjectUrl>https://andrew.gubskiy.com/open-source</PackageProjectUrl>

<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>xpagedlist.snk</AssemblyOriginatorKeyFile>
Expand Down
17 changes: 8 additions & 9 deletions src/X.PagedList.Mvc.Core/README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
# X.PagedList.Mvc.Core

[![NuGet Version](http://img.shields.io/nuget/v/X.PagedList.Mvc.Core.svg?style=flat)](https://www.nuget.org/packages/X.PagedList.Mvc.Core/)
[![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)
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.

## 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.
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`.

## 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).

## 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.
Licensed under the [MIT License](https://github.com/dncuug/X.PagedList/blob/master/LICENSE).
8 changes: 6 additions & 2 deletions src/X.PagedList.Mvc.Core/X.PagedList.Mvc.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>

<PackageTags>paging pagedlist paged list web mvc</PackageTags>
<PackageIcon>x-web.png</PackageIcon>
</PropertyGroup>

<ItemGroup>
Expand All @@ -18,13 +19,16 @@
<None Include="../../LICENSE.md" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<None Include="../../x-web.png" Pack="True" PackagePath=""/>
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\X.PagedList\X.PagedList.csproj" />
<ProjectReference Include="..\X.Web.PagedList\X.Web.PagedList.csproj" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/X.PagedList/PagedListExtensions.cs
Original file line number Diff line number Diff line change
@@ -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}"/>.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace X.PagedList.Mvc.Core;
namespace X.Web.PagedList;

public class AjaxOptions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using JetBrains.Annotations;
using System.Linq;
using JetBrains.Annotations;
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Mvc.Rendering;
using System.Linq;
using X.PagedList;
using X.PagedList.Extensions;

Check failure on line 6 in src/X.Web.PagedList/Fluent/HtmlPagerExtensions.cs

View workflow job for this annotation

GitHub Actions / Target win-x64

The type or namespace name 'Extensions' does not exist in the namespace 'X.PagedList' (are you missing an assembly reference?)

Check failure on line 6 in src/X.Web.PagedList/Fluent/HtmlPagerExtensions.cs

View workflow job for this annotation

GitHub Actions / Target win-x64

The type or namespace name 'Extensions' does not exist in the namespace 'X.PagedList' (are you missing an assembly reference?)

Check failure on line 6 in src/X.Web.PagedList/Fluent/HtmlPagerExtensions.cs

View workflow job for this annotation

GitHub Actions / Target win-x64

The type or namespace name 'Extensions' does not exist in the namespace 'X.PagedList' (are you missing an assembly reference?)

Check failure on line 6 in src/X.Web.PagedList/Fluent/HtmlPagerExtensions.cs

View workflow job for this annotation

GitHub Actions / Target win-x64

The type or namespace name 'Extensions' does not exist in the namespace 'X.PagedList' (are you missing an assembly reference?)

Check failure on line 6 in src/X.Web.PagedList/Fluent/HtmlPagerExtensions.cs

View workflow job for this annotation

GitHub Actions / Target linux-x64

The type or namespace name 'Extensions' does not exist in the namespace 'X.PagedList' (are you missing an assembly reference?)

Check failure on line 6 in src/X.Web.PagedList/Fluent/HtmlPagerExtensions.cs

View workflow job for this annotation

GitHub Actions / Target linux-x64

The type or namespace name 'Extensions' does not exist in the namespace 'X.PagedList' (are you missing an assembly reference?)

Check failure on line 6 in src/X.Web.PagedList/Fluent/HtmlPagerExtensions.cs

View workflow job for this annotation

GitHub Actions / Target linux-x64

The type or namespace name 'Extensions' does not exist in the namespace 'X.PagedList' (are you missing an assembly reference?)

Check failure on line 6 in src/X.Web.PagedList/Fluent/HtmlPagerExtensions.cs

View workflow job for this annotation

GitHub Actions / Target linux-x64

The type or namespace name 'Extensions' does not exist in the namespace 'X.PagedList' (are you missing an assembly reference?)

namespace X.PagedList.Mvc.Core.Fluent;
namespace X.Web.PagedList.Fluent;

[PublicAPI]
public static class HtmlPagerExtensions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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" />.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
18 changes: 18 additions & 0 deletions src/X.Web.PagedList/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# 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)


## 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).

## 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.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc.Rendering;

namespace X.PagedList.Mvc.Core;
namespace X.Web.PagedList;

public interface ITagBuilderFactory
{
Expand Down
35 changes: 35 additions & 0 deletions src/X.Web.PagedList/X.Web.PagedList.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Title>X.Web.PagedList</Title>
<Description>ASP.NET Core extensions for implementing paging in web applications.</Description>

<LangVersion>default</LangVersion>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>

<PackageTags>paging pagedlist paged list web mvc</PackageTags>
<PackageIcon>x-web.png</PackageIcon>
</PropertyGroup>

<ItemGroup>
<None Include="README.md" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<None Include="../../LICENSE.md" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<None Include="../../x-web.png" Pack="True" PackagePath=""/>
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\X.PagedList\X.PagedList.csproj" />
</ItemGroup>

</Project>
File renamed without changes
Binary file added src/X.Web.PagedList/xpagedlist.snk
Binary file not shown.
1 change: 0 additions & 1 deletion tests/X.PagedList.Tests/PagedListExample.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Linq;
using X.PagedList.Extensions;

namespace X.PagedList.Tests;

Expand Down
1 change: 0 additions & 1 deletion tests/X.PagedList.Tests/PagedListFacts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion tests/X.PagedList.Tests/PagedListTheories.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using AutoFixture;
using System.Linq;
using X.PagedList.Extensions;
using Xunit;

namespace X.PagedList.Tests;
Expand Down
Loading

0 comments on commit 44d5ea0

Please sign in to comment.