Skip to content

Commit 2dfa858

Browse files
committed
Upgraded to latest nuget packages including ABP.
1 parent 3416276 commit 2dfa858

File tree

119 files changed

+8828
-4395
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+8828
-4395
lines changed

src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.6.3.1, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.6.3.1\lib\net451\Abp.dll</HintPath>
37-
<Private>True</Private>
35+
<Reference Include="Abp, Version=0.6.4.1, Culture=neutral, processorArchitecture=MSIL">
36+
<SpecificVersion>False</SpecificVersion>
37+
<HintPath>..\packages\Abp.0.6.4.1\lib\net451\Abp.dll</HintPath>
3838
</Reference>
39-
<Reference Include="Abp.AutoMapper, Version=0.6.3.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.AutoMapper.0.6.3.0\lib\net451\Abp.AutoMapper.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="Abp.AutoMapper, Version=0.6.4.0, Culture=neutral, processorArchitecture=MSIL">
40+
<SpecificVersion>False</SpecificVersion>
41+
<HintPath>..\packages\Abp.AutoMapper.0.6.4.0\lib\net451\Abp.AutoMapper.dll</HintPath>
4242
</Reference>
4343
<Reference Include="AutoMapper">
4444
<HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
@@ -58,9 +58,9 @@
5858
<SpecificVersion>False</SpecificVersion>
5959
<HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
6060
</Reference>
61-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
61+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6262
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
63+
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
6464
</Reference>
6565
<Reference Include="Nito.AsyncEx">
6666
<HintPath>..\packages\Nito.AsyncEx.3.0.0\lib\net45\Nito.AsyncEx.dll</HintPath>

src/AbpCompanyName.AbpProjectName.Application/app.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
1515
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
1616
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
20+
</dependentAssembly>
1721
</assemblyBinding>
1822
</runtime>
1923
</configuration>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.6.3.1" targetFramework="net451" />
4-
<package id="Abp.AutoMapper" version="0.6.3.0" targetFramework="net451" />
3+
<package id="Abp" version="0.6.4.1" targetFramework="net451" />
4+
<package id="Abp.AutoMapper" version="0.6.4.0" targetFramework="net451" />
55
<package id="AutoMapper" version="3.3.1" targetFramework="net451" />
66
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
77
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
88
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
99
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
10-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
10+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
1111
<package id="Nito.AsyncEx" version="3.0.0" targetFramework="net451" />
1212
</packages>

src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.6.3.1, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.6.3.1\lib\net451\Abp.dll</HintPath>
37-
<Private>True</Private>
35+
<Reference Include="Abp, Version=0.6.4.1, Culture=neutral, processorArchitecture=MSIL">
36+
<SpecificVersion>False</SpecificVersion>
37+
<HintPath>..\packages\Abp.0.6.4.1\lib\net451\Abp.dll</HintPath>
3838
</Reference>
3939
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4040
<SpecificVersion>False</SpecificVersion>
@@ -48,9 +48,9 @@
4848
<SpecificVersion>False</SpecificVersion>
4949
<HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
5050
</Reference>
51-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
51+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5252
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
53+
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
5454
</Reference>
5555
<Reference Include="Nito.AsyncEx">
5656
<HintPath>..\packages\Nito.AsyncEx.3.0.0\lib\net45\Nito.AsyncEx.dll</HintPath>

src/AbpCompanyName.AbpProjectName.Core/app.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
77
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
88
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
12+
</dependentAssembly>
913
</assemblyBinding>
1014
</runtime>
1115
</configuration>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.6.3.1" targetFramework="net451" />
3+
<package id="Abp" version="0.6.4.1" targetFramework="net451" />
44
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
55
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
66
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
77
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
8-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
8+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
99
<package id="Nito.AsyncEx" version="3.0.0" targetFramework="net451" />
1010
</packages>

src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.6.3.1, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.6.3.1\lib\net451\Abp.dll</HintPath>
37-
<Private>True</Private>
35+
<Reference Include="Abp, Version=0.6.4.1, Culture=neutral, processorArchitecture=MSIL">
36+
<SpecificVersion>False</SpecificVersion>
37+
<HintPath>..\packages\Abp.0.6.4.1\lib\net451\Abp.dll</HintPath>
3838
</Reference>
39-
<Reference Include="Abp.EntityFramework, Version=0.6.3.1, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.EntityFramework.0.6.3.1\lib\net451\Abp.EntityFramework.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="Abp.EntityFramework, Version=0.6.4.1, Culture=neutral, processorArchitecture=MSIL">
40+
<SpecificVersion>False</SpecificVersion>
41+
<HintPath>..\packages\Abp.EntityFramework.0.6.4.1\lib\net451\Abp.EntityFramework.dll</HintPath>
4242
</Reference>
4343
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4444
<SpecificVersion>False</SpecificVersion>
@@ -56,17 +56,17 @@
5656
<SpecificVersion>False</SpecificVersion>
5757
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
5858
</Reference>
59-
<Reference Include="EntityFramework.DynamicFilters, Version=1.3.16.0, Culture=neutral, processorArchitecture=MSIL">
60-
<HintPath>..\packages\EntityFramework.DynamicFilters.1.3.16\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
61-
<Private>True</Private>
59+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
60+
<SpecificVersion>False</SpecificVersion>
61+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
6262
</Reference>
6363
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
6464
<SpecificVersion>False</SpecificVersion>
6565
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
6666
</Reference>
67-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
67+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6868
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
69+
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
7070
</Reference>
7171
<Reference Include="Nito.AsyncEx">
7272
<HintPath>..\packages\Nito.AsyncEx.3.0.0\lib\net45\Nito.AsyncEx.dll</HintPath>

src/AbpCompanyName.AbpProjectName.EntityFramework/App.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,12 @@
99
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
1010
</providers>
1111
</entityFramework>
12+
<runtime>
13+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
14+
<dependentAssembly>
15+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
16+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
17+
</dependentAssembly>
18+
</assemblyBinding>
19+
</runtime>
1220
</configuration>
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.6.3.1" targetFramework="net451" />
4-
<package id="Abp.EntityFramework" version="0.6.3.1" targetFramework="net451" />
3+
<package id="Abp" version="0.6.4.1" targetFramework="net451" />
4+
<package id="Abp.EntityFramework" version="0.6.4.1" targetFramework="net451" />
55
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
66
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
77
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
88
<package id="EntityFramework" version="6.1.3" targetFramework="net451" />
9-
<package id="EntityFramework.DynamicFilters" version="1.3.16" targetFramework="net451" />
9+
<package id="EntityFramework.DynamicFilters" version="1.4.0" targetFramework="net451" />
1010
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
11-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
11+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
1212
<package id="Nito.AsyncEx" version="3.0.0" targetFramework="net451" />
1313
</packages>

src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.6.3.1, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.6.3.1\lib\net451\Abp.dll</HintPath>
37-
<Private>True</Private>
35+
<Reference Include="Abp, Version=0.6.4.1, Culture=neutral, processorArchitecture=MSIL">
36+
<SpecificVersion>False</SpecificVersion>
37+
<HintPath>..\packages\Abp.0.6.4.1\lib\net451\Abp.dll</HintPath>
3838
</Reference>
39-
<Reference Include="Abp.FluentMigrator, Version=0.6.3.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.FluentMigrator.0.6.3.0\lib\net451\Abp.FluentMigrator.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="Abp.FluentMigrator, Version=0.6.4.0, Culture=neutral, processorArchitecture=MSIL">
40+
<SpecificVersion>False</SpecificVersion>
41+
<HintPath>..\packages\Abp.FluentMigrator.0.6.4.0\lib\net451\Abp.FluentMigrator.dll</HintPath>
4242
</Reference>
43-
<Reference Include="Abp.NHibernate, Version=0.6.3.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.NHibernate.0.6.3.0\lib\net451\Abp.NHibernate.dll</HintPath>
45-
<Private>True</Private>
43+
<Reference Include="Abp.NHibernate, Version=0.6.4.0, Culture=neutral, processorArchitecture=MSIL">
44+
<SpecificVersion>False</SpecificVersion>
45+
<HintPath>..\packages\Abp.NHibernate.0.6.4.0\lib\net451\Abp.NHibernate.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4848
<SpecificVersion>False</SpecificVersion>
@@ -56,9 +56,9 @@
5656
<SpecificVersion>False</SpecificVersion>
5757
<HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
5858
</Reference>
59-
<Reference Include="FluentMigrator, Version=1.5.1.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
60-
<HintPath>..\packages\FluentMigrator.1.5.1.0\lib\40\FluentMigrator.dll</HintPath>
61-
<Private>True</Private>
59+
<Reference Include="FluentMigrator, Version=1.6.0.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
60+
<SpecificVersion>False</SpecificVersion>
61+
<HintPath>..\packages\FluentMigrator.1.6.0\lib\40\FluentMigrator.dll</HintPath>
6262
</Reference>
6363
<Reference Include="FluentNHibernate, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
6464
<SpecificVersion>False</SpecificVersion>
@@ -68,9 +68,9 @@
6868
<SpecificVersion>False</SpecificVersion>
6969
<HintPath>..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
71+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
7272
<SpecificVersion>False</SpecificVersion>
73-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
73+
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
7474
</Reference>
7575
<Reference Include="NHibernate">
7676
<HintPath>..\packages\NHibernate.4.0.3.4000\lib\net40\NHibernate.dll</HintPath>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
..\packages\FluentMigrator.1.5.0.0\tools\Migrate.exe /connection "Server=localhost; Database=AbpProjectNameDb; Trusted_Connection=True;" /db sqlserver /target "bin\Debug\AbpProjectName.Infrastructure.NHibernate.dll"
1+
..\packages\FluentMigrator.1.6.0.0\tools\Migrate.exe /connection "Server=localhost; Database=AbpProjectNameDb; Trusted_Connection=True;" /db sqlserver /target "bin\Debug\AbpProjectName.Infrastructure.NHibernate.dll"
22
pause

src/AbpCompanyName.AbpProjectName.NHibernate/app.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="FluentMigrator" publicKeyToken="aacfc7de5acabf05" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-1.5.1.0" newVersion="1.5.1.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-1.6.0.0" newVersion="1.6.0.0" />
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
@@ -18,6 +18,10 @@
1818
<assemblyIdentity name="Iesi.Collections" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
1919
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
2020
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
24+
</dependentAssembly>
2125
</assemblyBinding>
2226
</runtime>
2327
</configuration>
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.6.3.1" targetFramework="net451" />
4-
<package id="Abp.FluentMigrator" version="0.6.3.0" targetFramework="net451" />
5-
<package id="Abp.NHibernate" version="0.6.3.0" targetFramework="net451" />
3+
<package id="Abp" version="0.6.4.1" targetFramework="net451" />
4+
<package id="Abp.FluentMigrator" version="0.6.4.0" targetFramework="net451" />
5+
<package id="Abp.NHibernate" version="0.6.4.0" targetFramework="net451" />
66
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
77
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
88
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
9-
<package id="FluentMigrator" version="1.5.1.0" targetFramework="net451" />
9+
<package id="FluentMigrator" version="1.6.0" targetFramework="net451" />
1010
<package id="FluentNHibernate" version="2.0.1.0" targetFramework="net451" />
1111
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net451" />
1212
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
13-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
13+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
1414
<package id="NHibernate" version="4.0.3.4000" targetFramework="net451" />
1515
<package id="Nito.AsyncEx" version="3.0.0" targetFramework="net451" />
1616
</packages>

0 commit comments

Comments
 (0)