Skip to content

Commit b484a76

Browse files
ernado-xernado-x
authored
Merge pull request #285 from dncuug/namespace-update-stage-2
Namespace update. Stage 2
2 parents 989e774 + dd3b4f2 commit b484a76

File tree

12 files changed

+91
-39
lines changed

12 files changed

+91
-39
lines changed

‎X.PagedList.sln

+8-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.Website", "examples
2222
EndProject
2323
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.DAL", "examples\Example.DAL\Example.DAL.csproj", "{AD16A8D1-EAF0-4947-BCEC-A8B423B2F117}"
2424
EndProject
25-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.PagedList.EF", "src\X.PagedList.EF\X.PagedList.EF.csproj", "{1934BC10-30AE-4C4C-AF22-E444B1F70ACA}"
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.Extensions.PagedList.EF", "src\X.Extensions.PagedList.EF\X.Extensions.PagedList.EF.csproj", "{1934BC10-30AE-4C4C-AF22-E444B1F70ACA}"
2626
EndProject
2727
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}"
2828
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X.PagedList.EF", "src\X.PagedList.EF\X.PagedList.EF.csproj", "{F876C4B5-EA60-44B5-97E7-40B1E7E86DEE}"
30+
EndProject
2931
Global
3032
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3133
Debug|Any CPU = Debug|Any CPU
@@ -60,6 +62,10 @@ Global
6062
{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
6163
{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
6264
{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE}.Release|Any CPU.Build.0 = Release|Any CPU
65+
{F876C4B5-EA60-44B5-97E7-40B1E7E86DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66+
{F876C4B5-EA60-44B5-97E7-40B1E7E86DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
67+
{F876C4B5-EA60-44B5-97E7-40B1E7E86DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
68+
{F876C4B5-EA60-44B5-97E7-40B1E7E86DEE}.Release|Any CPU.Build.0 = Release|Any CPU
6369
EndGlobalSection
6470
GlobalSection(SolutionProperties) = preSolution
6571
HideSolutionNode = FALSE
@@ -72,6 +78,7 @@ Global
7278
{AD16A8D1-EAF0-4947-BCEC-A8B423B2F117} = {309A8FC8-4784-4D8D-903F-BD54EBB0F1D7}
7379
{1934BC10-30AE-4C4C-AF22-E444B1F70ACA} = {BDDADD09-D112-418E-8469-BC762EC09936}
7480
{3B840A44-3150-4BB5-83DA-9B81D1FCB6BE} = {BDDADD09-D112-418E-8469-BC762EC09936}
81+
{F876C4B5-EA60-44B5-97E7-40B1E7E86DEE} = {BDDADD09-D112-418E-8469-BC762EC09936}
7582
EndGlobalSection
7683
GlobalSection(ExtensibilityGlobals) = postSolution
7784
SolutionGuid = {1A82D446-6F26-48B2-8085-DFA5F87453FC}

‎examples/Example.Website/Controllers/EFController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading.Tasks;
33
using Example.DAL;
44
using Microsoft.AspNetCore.Mvc;
5-
using X.PagedList.EF;
5+
using X.Extensions.PagedList.EF;
66

77
namespace Example.Website.Controllers;
88

‎examples/Example.Website/Example.Website.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<ProjectReference Include="..\..\src\X.PagedList.EF\X.PagedList.EF.csproj"/>
9+
<ProjectReference Include="..\..\src\X.Extensions.PagedList.EF\X.Extensions.PagedList.EF.csproj" />
1010
<ProjectReference Include="..\..\src\X.PagedList\X.PagedList.csproj"/>
1111
<ProjectReference Include="..\..\src\X.Web.PagedList\X.Web.PagedList.csproj" />
1212
<ProjectReference Include="..\Example.DAL\Example.DAL.csproj"/>

‎src/X.PagedList.EF/PagedListExtensions.cs ‎src/X.Extensions.PagedList.EF/PagedListExtensions.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
using JetBrains.Annotations;
2-
using Microsoft.EntityFrameworkCore;
3-
using System;
1+
using System;
42
using System.Collections.Generic;
53
using System.Linq;
64
using System.Threading;
75
using System.Threading.Tasks;
6+
using JetBrains.Annotations;
7+
using Microsoft.EntityFrameworkCore;
8+
using X.PagedList;
89

9-
namespace X.PagedList.EF;
10+
namespace X.Extensions.PagedList.EF;
1011

1112
/// <summary>
1213
/// EntityFramework extension methods designed to simplify the creation of instances of <see cref="PagedList{T}"/>.

‎src/X.Extensions.PagedList.EF/README.md

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# X.Extensions.PagedList.EF
2+
3+
[![NuGet Version](http://img.shields.io/nuget/v/X.Extensions.PagedList.EF.svg?style=flat)](https://www.nuget.org/packages/X.Extensions.PagedList.EF/)
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.Extensions.PagedList.EF library provides Entity Framework Core extensions for the X.PagedList library, enabling easier
9+
paging through data collections within Entity Framework contexts. This extension facilitates the creation of paged
10+
lists from IQueryable collections, streamlining the process of managing large datasets in .NET applications.
11+
12+
## How to use
13+
You can find all information about how to use X.PagedList libraries in [Wiki](https://github.com/dncuug/X.PagedList/wiki)
14+
15+
## License
16+
Licensed under the [MIT License](https://github.com/dncuug/X.PagedList/blob/master/LICENSE).

‎src/X.Extensions.PagedList.EF/X.Extensions.PagedList.EF.csproj

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Title>X.Extensions.PagedList.EF</Title>
5+
<Description>EF extensions for X.PagedList library</Description>
6+
7+
<LangVersion>default</LangVersion>
8+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
9+
10+
<PackageTags>paging pagedlist paged list entity framework ef</PackageTags>
11+
<PackageIcon>x-extensions.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-extensions.png" Pack="True" PackagePath=""/>
24+
</ItemGroup>
25+
26+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
27+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[7.0.20,8)"/>
28+
</ItemGroup>
29+
30+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
31+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7"/>
32+
</ItemGroup>
33+
34+
<ItemGroup>
35+
<ProjectReference Include="..\X.PagedList\X.PagedList.csproj"/>
36+
</ItemGroup>
37+
38+
</Project>

‎src/X.Extensions.PagedList.EF/xpagedlist.snk

596 Bytes
Binary file not shown.

‎src/X.PagedList.EF/README.md

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
# X.PagedList.EF
2+
The X.PagedList.EF is a set of extensions for X.PagedList library which extent Entity Framework integration.
23

3-
[![NuGet Version](http://img.shields.io/nuget/v/X.PagedList.EF.svg?style=flat)](https://www.nuget.org/packages/X.PagedList.EF/)
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)
4+
## Important announcement
5+
In a continuous effort to enhance library quality and support, this package has been migrated to X.Extensions.PagedList.EF.
56

7+
From now on, please use [X.Extensions.PagedList.EF](https://www.nuget.org/packages/X.Extensions.PagedList.EF/) instead of this package.
68

7-
## What is this?
8-
The X.PagedList.EF library provides Entity Framework Core extensions for the X.PagedList library, enabling easier
9-
paging through data collections within Entity Framework contexts. This extension facilitates the creation of paged
10-
lists from IQueryable collections, streamlining the process of managing large datasets in .NET applications.
9+
It's important to note that you must update your code to use the `X.Extensions.PagedList.EF` namespace instead of `X.PagedList.EF`.
1110

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

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

‎src/X.PagedList.EF/X.PagedList.EF.csproj

+7-13
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,25 @@
77
<LangVersion>default</LangVersion>
88
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
99

10-
<PackageTags>paging pagedlist paged list entity framework ef</PackageTags>
10+
<PackageTags>paging pagedlist paged list web mvc</PackageTags>
11+
<PackageIcon>x-extensions.png</PackageIcon>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
14-
<None Include="README.md" Pack="true" PackagePath=""/>
15+
<None Include="README.md" Pack="true" PackagePath="" />
1516
</ItemGroup>
1617

1718
<ItemGroup>
18-
<None Include="../../LICENSE.md" Pack="true" PackagePath=""/>
19+
<None Include="../../LICENSE.md" Pack="true" PackagePath="" />
1920
</ItemGroup>
2021

2122
<ItemGroup>
22-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="all"/>
23-
</ItemGroup>
24-
25-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
26-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[7.0.20,8)"/>
27-
</ItemGroup>
28-
29-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
30-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7"/>
23+
<None Include="../../x-extensions.png" Pack="True" PackagePath=""/>
3124
</ItemGroup>
25+
3226

3327
<ItemGroup>
34-
<ProjectReference Include="..\X.PagedList\X.PagedList.csproj"/>
28+
<ProjectReference Include="..\X.Extensions.PagedList.EF\X.Extensions.PagedList.EF.csproj" />
3529
</ItemGroup>
3630

3731
</Project>

‎src/X.PagedList.EF/icon.png

-6.07 KB
Binary file not shown.

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<None Include="README.md" Pack="true" PackagePath="" />
15+
<None Include="README.md" Pack="true" PackagePath=""/>
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<None Include="../../LICENSE.md" Pack="true" PackagePath="" />
19+
<None Include="../../LICENSE.md" Pack="true" PackagePath=""/>
2020
</ItemGroup>
2121

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

2626
<ItemGroup>
27-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
27+
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<ProjectReference Include="..\X.Web.PagedList\X.Web.PagedList.csproj" />
31+
<ProjectReference Include="..\X.Web.PagedList\X.Web.PagedList.csproj"/>
3232
</ItemGroup>
3333

3434
</Project>

‎src/X.Web.PagedList/X.Web.PagedList.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<None Include="README.md" Pack="true" PackagePath="" />
15+
<None Include="README.md" Pack="true" PackagePath=""/>
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<None Include="../../LICENSE.md" Pack="true" PackagePath="" />
19+
<None Include="../../LICENSE.md" Pack="true" PackagePath=""/>
2020
</ItemGroup>
2121

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

2626
<ItemGroup>
27-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
28-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="all" />
27+
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
28+
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="all"/>
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<ProjectReference Include="..\X.PagedList\X.PagedList.csproj" />
32+
<ProjectReference Include="..\X.PagedList\X.PagedList.csproj"/>
3333
</ItemGroup>
3434

3535
</Project>

0 commit comments

Comments
 (0)