Skip to content

Commit 22b58b9

Browse files
hikalkanhikalkan
committed
Upgraded nuget packages.
1 parent e1fccdf commit 22b58b9

File tree

29 files changed

+402
-351
lines changed

29 files changed

+402
-351
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="Abp.AutoMapper, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.AutoMapper.0.7.2.0\lib\net451\Abp.AutoMapper.dll</HintPath>
39+
<Reference Include="Abp.AutoMapper, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.AutoMapper.0.7.4.1\lib\net451\Abp.AutoMapper.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="AutoMapper, Version=4.0.4.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
44-
<HintPath>..\packages\AutoMapper.4.0.4\lib\net45\AutoMapper.dll</HintPath>
43+
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
44+
<HintPath>..\packages\AutoMapper.4.1.1\lib\net45\AutoMapper.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.Application/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
15+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎src/AbpCompanyName.AbpProjectName.Application/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.7.3.0" targetFramework="net451" />
4-
<package id="Abp.AutoMapper" version="0.7.2.0" targetFramework="net451" />
5-
<package id="AutoMapper" version="4.0.4" targetFramework="net451" />
3+
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
4+
<package id="Abp.AutoMapper" version="0.7.4.1" targetFramework="net451" />
5+
<package id="AutoMapper" version="4.1.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" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
3939
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.Core/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.7.3.0" targetFramework="net451" />
3+
<package id="Abp" version="0.7.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" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="Abp.EntityFramework, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.EntityFramework.0.7.2.0\lib\net451\Abp.EntityFramework.dll</HintPath>
39+
<Reference Include="Abp.EntityFramework, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.EntityFramework.0.7.4.1\lib\net451\Abp.EntityFramework.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -56,8 +56,8 @@
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.4.1.0, Culture=neutral, processorArchitecture=MSIL">
60-
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.1\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
59+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
60+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.3\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config

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.7.3.0" targetFramework="net451" />
4-
<package id="Abp.EntityFramework" version="0.7.2.0" targetFramework="net451" />
3+
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
4+
<package id="Abp.EntityFramework" version="0.7.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.4.1" targetFramework="net451" />
9+
<package id="EntityFramework.DynamicFilters" version="1.4.3" targetFramework="net451" />
1010
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
1111
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
1212
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="Abp.FluentMigrator, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.FluentMigrator.0.7.3.0\lib\net451\Abp.FluentMigrator.dll</HintPath>
39+
<Reference Include="Abp.FluentMigrator, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.FluentMigrator.0.7.4.1\lib\net451\Abp.FluentMigrator.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="Abp.NHibernate, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.NHibernate.0.7.2.0\lib\net451\Abp.NHibernate.dll</HintPath>
43+
<Reference Include="Abp.NHibernate, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Abp.NHibernate.0.7.4.1\lib\net451\Abp.NHibernate.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -56,13 +56,13 @@
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.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>
59+
<Reference Include="FluentMigrator, Version=1.6.1.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
60+
<HintPath>..\packages\FluentMigrator.1.6.1\lib\40\FluentMigrator.dll</HintPath>
61+
<Private>True</Private>
6262
</Reference>
63-
<Reference Include="FluentNHibernate, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
64-
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\packages\FluentNHibernate.2.0.1.0\lib\net40\FluentNHibernate.dll</HintPath>
63+
<Reference Include="FluentNHibernate, Version=2.0.3.0, Culture=neutral, processorArchitecture=MSIL">
64+
<HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
65+
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
6868
<SpecificVersion>False</SpecificVersion>

‎src/AbpCompanyName.AbpProjectName.NHibernate/app.config

Lines changed: 1 addition & 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.6.0.0" newVersion="1.6.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-1.6.1.0" newVersion="1.6.1.0" />
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />

‎src/AbpCompanyName.AbpProjectName.NHibernate/packages.config

Lines changed: 5 additions & 5 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.7.3.0" targetFramework="net451" />
4-
<package id="Abp.FluentMigrator" version="0.7.3.0" targetFramework="net451" />
5-
<package id="Abp.NHibernate" version="0.7.2.0" targetFramework="net451" />
3+
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
4+
<package id="Abp.FluentMigrator" version="0.7.4.1" targetFramework="net451" />
5+
<package id="Abp.NHibernate" version="0.7.4.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" />
9-
<package id="FluentMigrator" version="1.6.0" targetFramework="net451" />
10-
<package id="FluentNHibernate" version="2.0.1.0" targetFramework="net451" />
9+
<package id="FluentMigrator" version="1.6.1" targetFramework="net451" />
10+
<package id="FluentNHibernate" version="2.0.3.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" />
1313
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />

‎src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,24 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="Abp.AutoMapper, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.AutoMapper.0.7.2.0\lib\net451\Abp.AutoMapper.dll</HintPath>
39+
<Reference Include="Abp.AutoMapper, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.AutoMapper.0.7.4.1\lib\net451\Abp.AutoMapper.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="Abp.Web, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.Web.0.7.3.0\lib\net451\Abp.Web.dll</HintPath>
43+
<Reference Include="Abp.Web, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Abp.Web.0.7.4.1\lib\net451\Abp.Web.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
47-
<Reference Include="Abp.Web.Api, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Web.Api.0.7.2.0\lib\net451\Abp.Web.Api.dll</HintPath>
47+
<Reference Include="Abp.Web.Api, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Web.Api.0.7.4.1\lib\net451\Abp.Web.Api.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
51-
<Reference Include="AutoMapper, Version=4.0.4.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
52-
<HintPath>..\packages\AutoMapper.4.0.4\lib\net45\AutoMapper.dll</HintPath>
51+
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
52+
<HintPath>..\packages\AutoMapper.4.1.1\lib\net45\AutoMapper.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.WebApi/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</dependentAssembly>
2929
<dependentAssembly>
3030
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
31-
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
31+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
3232
</dependentAssembly>
3333
</assemblyBinding>
3434
</runtime>

‎src/AbpCompanyName.AbpProjectName.WebApi/packages.config

Lines changed: 5 additions & 5 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.7.3.0" targetFramework="net451" />
4-
<package id="Abp.AutoMapper" version="0.7.2.0" targetFramework="net451" />
5-
<package id="Abp.Web" version="0.7.3.0" targetFramework="net451" />
6-
<package id="Abp.Web.Api" version="0.7.2.0" targetFramework="net451" />
7-
<package id="AutoMapper" version="4.0.4" targetFramework="net451" />
3+
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
4+
<package id="Abp.AutoMapper" version="0.7.4.1" targetFramework="net451" />
5+
<package id="Abp.Web" version="0.7.4.1" targetFramework="net451" />
6+
<package id="Abp.Web.Api" version="0.7.4.1" targetFramework="net451" />
7+
<package id="AutoMapper" version="4.1.1" targetFramework="net451" />
88
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
99
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
1010
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />

‎src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/libs/abp.jtable.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
$dfd.resolve({
5656
"Result": "OK",
5757
"Records": result.items || result[originalListAction.recordsField],
58-
"TotalRecordCount": result.totalCount
58+
"TotalRecordCount": result.totalCount,
59+
originalResult: result
5960
});
6061
})
6162
.fail(function (error) {
@@ -78,7 +79,8 @@
7879
.done(function (result) {
7980
$dfd.resolve({
8081
"Result": "OK",
81-
"Record": originalCreateAction.recordField ? result[originalCreateAction.recordField] : result
82+
"Record": originalCreateAction.recordField ? result[originalCreateAction.recordField] : result,
83+
originalResult: result
8284
});
8385
})
8486
.fail(function (error) {
@@ -99,7 +101,11 @@
99101

100102
originalUpdateAction.method(input)
101103
.done(function (result) {
102-
var jtableResult = { "Result": "OK" };
104+
var jtableResult = {
105+
"Result": "OK",
106+
originalResult: result
107+
};
108+
103109
if (originalUpdateAction.returnsRecord) {
104110
if (originalUpdateAction.recordField) {
105111
jtableResult.Record = result[originalUpdateAction.recordField];
@@ -127,9 +133,10 @@
127133
var input = $.extend({}, postData);
128134

129135
originalDeleteAction.method(input)
130-
.done(function () {
136+
.done(function (result) {
131137
$dfd.resolve({
132-
"Result": "OK"
138+
"Result": "OK",
139+
originalResult: result
133140
});
134141
})
135142
.fail(function (error) {

0 commit comments

Comments
 (0)