Skip to content

Commit 857f986

Browse files
a-gubskiya-gubskiy
committed
Update packages versions.
Update code formatting.
1 parent 02a256d commit 857f986

File tree

5 files changed

+57
-46
lines changed

5 files changed

+57
-46
lines changed

‎examples/X.PagedList.Mvc.Example/Web.config

+30-27
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,17 @@
55
-->
66
<configuration>
77
<configSections>
8-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
9-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
8+
9+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
10+
<section name="entityFramework"
11+
type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
12+
requirePermission="false"/>
1013
</configSections>
1114
<appSettings>
12-
<add key="webpages:Version" value="3.0.0.0" />
13-
<add key="webpages:Enabled" value="false" />
14-
<add key="ClientValidationEnabled" value="true" />
15-
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
15+
<add key="webpages:Version" value="3.0.0.0"/>
16+
<add key="webpages:Enabled" value="false"/>
17+
<add key="ClientValidationEnabled" value="true"/>
18+
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
1619
</appSettings>
1720
<!--
1821
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
@@ -25,56 +28,56 @@
2528
<system.web>
2629
<compilation debug="true" targetFramework="4.6.1">
2730
<assemblies>
28-
<add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
29-
<add assembly="System.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
31+
<add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
32+
<add assembly="System.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
3033
</assemblies>
3134
</compilation>
32-
<httpRuntime targetFramework="4.5.2" />
33-
<httpModules />
35+
<httpRuntime targetFramework="4.5.2"/>
36+
<httpModules/>
3437
</system.web>
3538
<runtime>
3639
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
3740
<dependentAssembly>
38-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
39-
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
41+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
42+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
4043
</dependentAssembly>
4144
<dependentAssembly>
42-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
43-
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
45+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
46+
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
4447
</dependentAssembly>
4548
<dependentAssembly>
46-
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
47-
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
49+
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/>
50+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
4851
</dependentAssembly>
4952
<dependentAssembly>
50-
<assemblyIdentity name="System.Linq.Expressions" publicKeyToken="b03f5f7f11d50a3a'" />
51-
<bindingRedirect oldVersion="1.0.0.0-4.3.3.0" newVersion="4.3.3.0" />
53+
<assemblyIdentity name="System.Linq.Expressions" publicKeyToken="b03f5f7f11d50a3a'"/>
54+
<bindingRedirect oldVersion="1.0.0.0-4.3.3.0" newVersion="4.3.3.0"/>
5255
</dependentAssembly>
5356
<dependentAssembly>
54-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
55-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
57+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
58+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
5659
</dependentAssembly>
5760
<dependentAssembly>
58-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
59-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
61+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
62+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
6063
</dependentAssembly>
6164
<dependentAssembly>
62-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
63-
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
65+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
66+
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
6467
</dependentAssembly>
6568
</assemblyBinding>
6669
</runtime>
6770
<system.webServer>
68-
<validation validateIntegratedModeConfiguration="false" />
71+
<validation validateIntegratedModeConfiguration="false"/>
6972
</system.webServer>
7073
<entityFramework>
7174
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
7275
<parameters>
73-
<parameter value="mssqllocaldb" />
76+
<parameter value="mssqllocaldb"/>
7477
</parameters>
7578
</defaultConnectionFactory>
7679
<providers>
77-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
80+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
7881
</providers>
7982
</entityFramework>
8083
</configuration>

‎examples/X.PagedList.Mvc.Example/X.PagedList.Mvc.Example.csproj

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\EntityFramework.6.4.0\build\EntityFramework.props" Condition="Exists('..\..\packages\EntityFramework.6.4.0\build\EntityFramework.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -51,19 +52,22 @@
5152
<Reference Include="AutoMapper, Version=7.0.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5253
<HintPath>..\..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll</HintPath>
5354
</Reference>
54-
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
55+
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
56+
<HintPath>..\..\packages\EntityFramework.6.4.0\lib\net45\EntityFramework.dll</HintPath>
57+
<Private>True</Private>
5658
</Reference>
57-
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
58-
<HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
59+
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
60+
<HintPath>..\..\packages\EntityFramework.6.4.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
61+
<Private>True</Private>
5962
</Reference>
6063
<Reference Include="Microsoft.CSharp" />
6164
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6265
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
6366
<Private>True</Private>
6467
</Reference>
65-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
66-
<HintPath>..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
68+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
69+
<HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
70+
<Private>True</Private>
6771
</Reference>
6872
<Reference Include="System.Data.DataSetExtensions" />
6973
<Reference Include="System.Linq.Expressions">
@@ -288,7 +292,10 @@
288292
<PropertyGroup>
289293
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
290294
</PropertyGroup>
295+
<Error Condition="!Exists('..\..\packages\EntityFramework.6.4.0\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EntityFramework.6.4.0\build\EntityFramework.props'))" />
296+
<Error Condition="!Exists('..\..\packages\EntityFramework.6.4.0\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EntityFramework.6.4.0\build\EntityFramework.targets'))" />
291297
</Target>
298+
<Import Project="..\..\packages\EntityFramework.6.4.0\build\EntityFramework.targets" Condition="Exists('..\..\packages\EntityFramework.6.4.0\build\EntityFramework.targets')" />
292299
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
293300
Other similar extension points exist, see Microsoft.Common.targets.
294301
<Target Name="BeforeBuild">

‎examples/X.PagedList.Mvc.Example/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Antlr" version="3.5.0.2" targetFramework="net46" />
44
<package id="AutoMapper" version="7.0.1" targetFramework="net461" />
55
<package id="bootstrap" version="3.3.7" targetFramework="net46" />
6-
<package id="EntityFramework" version="6.2.0" targetFramework="net46" />
6+
<package id="EntityFramework" version="6.4.0" targetFramework="net472" />
77
<package id="jQuery" version="3.4.1" targetFramework="net461" />
88
<package id="jQuery.UI.Combined" version="1.12.1" targetFramework="net46" />
99
<package id="jQuery.Validation" version="1.17.0" targetFramework="net461" />
@@ -14,7 +14,7 @@
1414
<package id="Microsoft.jQuery.Unobtrusive.Ajax" version="3.2.6" targetFramework="net461" />
1515
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.11" targetFramework="net461" />
1616
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
17-
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
17+
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
1818
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
1919
<package id="WebGrease" version="1.6.0" targetFramework="net46" />
2020
</packages>

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public PagedList(IQueryable<T> superset, Func<T, TKey> keySelectorMethod, int pa
3737
}
3838

3939
private void InitSubset(IQueryable<T> superset, Func<T, TKey> keySelectorMethod, int pageNumber, int pageSize)
40-
{
41-
// add items to internal list
42-
var items = pageNumber == 1
40+
{
41+
// add items to internal list
42+
var items = pageNumber == 1
4343
? superset.OrderBy(keySelectorMethod).AsQueryable().Take(() => pageSize).ToList()
4444
: superset.OrderBy(keySelectorMethod).AsQueryable().Skip(() => (pageNumber - 1) * pageSize).Take(() => pageSize).ToList();
4545

@@ -72,11 +72,11 @@ public PagedList(IQueryable<T> superset, int pageNumber, int pageSize)
7272
: base(pageNumber, pageSize, superset?.Count() ?? 0)
7373
{
7474
if (TotalItemCount > 0)
75-
{
75+
{
7676

77-
superset = superset ?? new List<T>().AsQueryable();
77+
superset = superset ?? new List<T>().AsQueryable();
7878

79-
Subset.AddRange(pageNumber == 1
79+
Subset.AddRange(pageNumber == 1
8080
? superset.Take(() => pageSize).ToList()
8181
: superset.Skip(() => (pageNumber - 1) * pageSize).Take(() => pageSize).ToList()
8282
);

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@
22

33
<PropertyGroup>
44
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
5-
<Version>8.0.0</Version>
6-
<Authors>Copyright Troy Goode, Ernado © 2019</Authors>
5+
<Version>8.0.1</Version>
6+
<Authors>Copyright Troy Goode, Ernado © 2020</Authors>
77
<Company>.NET Core Ukrainian User Group</Company>
88
<Description>Library for easily paging through any IEnumerable/IQueryable in ASP.NET MVC</Description>
99
<PackageLicenseUrl>https://github.com/dncuug/X.PagedList/blob/master/LICENSE</PackageLicenseUrl>
1010
<PackageProjectUrl>https://github.com/dncuug/X.PagedList</PackageProjectUrl>
1111
<PackageIconUrl>https://ru.gravatar.com/userimage/8071071/f2dc08ee7e4016451f64a7ae9cffd110.png?size=200</PackageIconUrl>
1212
<RepositoryUrl>https://github.com/dncuug/X.PagedList.git</RepositoryUrl>
1313
<RepositoryType>git</RepositoryType>
14-
<AssemblyVersion>8.0.0</AssemblyVersion>
15-
<FileVersion>8.0.0</FileVersion>
14+
<AssemblyVersion>8.0.1</AssemblyVersion>
15+
<FileVersion>8.0.1</FileVersion>
1616
<TargetFramework>net472</TargetFramework>
17+
<LangVersion>8</LangVersion>
1718
</PropertyGroup>
1819

1920
<ItemGroup>
20-
<PackageReference Include="EntityFramework" Version="6.2.0" />
21+
<PackageReference Include="EntityFramework" Version="6.4.0" />
2122
</ItemGroup>
2223

2324
<ItemGroup>

0 commit comments

Comments
 (0)