Skip to content

Commit a270c87

Browse files
yekalkanyekalkan
committed
Abp version update
1 parent f40231d commit a270c87

File tree

16 files changed

+301
-396
lines changed

16 files changed

+301
-396
lines changed

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

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,20 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.2.2.2\lib\net46\Abp.dll</HintPath>
40-
<Private>True</Private>
38+
<Reference Include="Abp, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.2.3.0\lib\net46\Abp.dll</HintPath>
4140
</Reference>
42-
<Reference Include="Abp.AutoMapper, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.AutoMapper.2.2.1\lib\net46\Abp.AutoMapper.dll</HintPath>
44-
<Private>True</Private>
41+
<Reference Include="Abp.AutoMapper, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.2.3.0\lib\net46\Abp.AutoMapper.dll</HintPath>
4543
</Reference>
46-
<Reference Include="Abp.Zero, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Abp.Zero.2.2.1\lib\net46\Abp.Zero.dll</HintPath>
48-
<Private>True</Private>
44+
<Reference Include="Abp.Zero, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.2.3.0\lib\net46\Abp.Zero.dll</HintPath>
4946
</Reference>
50-
<Reference Include="Abp.Zero.Common, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Abp.Zero.Common.2.2.1\lib\net46\Abp.Zero.Common.dll</HintPath>
52-
<Private>True</Private>
47+
<Reference Include="Abp.Zero.Common, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.2.3.0\lib\net46\Abp.Zero.Common.dll</HintPath>
5349
</Reference>
54-
<Reference Include="AutoMapper, Version=6.1.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
55-
<HintPath>..\packages\AutoMapper.6.1.0\lib\net45\AutoMapper.dll</HintPath>
56-
<Private>True</Private>
50+
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51+
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
5752
</Reference>
5853
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5954
<HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
@@ -67,9 +62,8 @@
6762
<HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
6863
<Private>True</Private>
6964
</Reference>
70-
<Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
71-
<HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
72-
<Private>True</Private>
65+
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
66+
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
7367
</Reference>
7468
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7569
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
@@ -88,7 +82,7 @@
8882
<Private>True</Private>
8983
</Reference>
9084
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
91-
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
85+
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
9286
</Reference>
9387
<Reference Include="Nito.AsyncEx, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
9488
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
@@ -111,8 +105,7 @@
111105
<Reference Include="System.Configuration" />
112106
<Reference Include="System.Core" />
113107
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
114-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.3\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
115-
<Private>True</Private>
108+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.6\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
116109
</Reference>
117110
<Reference Include="System.Net" />
118111
<Reference Include="System.Runtime.Caching" />

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="2.2.2" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="2.2.1" targetFramework="net461" />
5-
<package id="Abp.Zero" version="2.2.1" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="2.2.1" targetFramework="net461" />
7-
<package id="AutoMapper" version="6.1.0" targetFramework="net461" />
3+
<package id="Abp" version="2.3.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="2.3.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="2.3.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="2.3.0" targetFramework="net461" />
7+
<package id="AutoMapper" version="6.1.1" targetFramework="net461" />
88
<package id="Castle.Core" version="4.0.0" targetFramework="net461" />
99
<package id="Castle.LoggingFacility" version="4.0.0" targetFramework="net461" />
1010
<package id="Castle.Windsor" version="4.0.0" targetFramework="net461" />
11-
<package id="JetBrains.Annotations" version="10.4.0" targetFramework="net452" />
11+
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net461" />
1212
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
1313
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1414
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
1515
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
16-
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
16+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
1717
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
1818
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net452" />
19-
<package id="System.Linq.Dynamic.Core" version="1.0.7.3" targetFramework="net461" />
19+
<package id="System.Linq.Dynamic.Core" version="1.0.7.6" targetFramework="net461" />
2020
</packages>

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,14 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.2.2.2\lib\net46\Abp.dll</HintPath>
40-
<Private>True</Private>
38+
<Reference Include="Abp, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.2.3.0\lib\net46\Abp.dll</HintPath>
4140
</Reference>
42-
<Reference Include="Abp.Zero, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.Zero.2.2.1\lib\net46\Abp.Zero.dll</HintPath>
44-
<Private>True</Private>
41+
<Reference Include="Abp.Zero, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.Zero.2.3.0\lib\net46\Abp.Zero.dll</HintPath>
4543
</Reference>
46-
<Reference Include="Abp.Zero.Common, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Abp.Zero.Common.2.2.1\lib\net46\Abp.Zero.Common.dll</HintPath>
48-
<Private>True</Private>
44+
<Reference Include="Abp.Zero.Common, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.Common.2.3.0\lib\net46\Abp.Zero.Common.dll</HintPath>
4946
</Reference>
5047
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5148
<HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
@@ -59,9 +56,8 @@
5956
<HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
6057
<Private>True</Private>
6158
</Reference>
62-
<Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
63-
<HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
64-
<Private>True</Private>
59+
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
60+
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
6561
</Reference>
6662
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6763
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
@@ -80,7 +76,7 @@
8076
<Private>True</Private>
8177
</Reference>
8278
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
83-
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
79+
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
8480
</Reference>
8581
<Reference Include="Nito.AsyncEx, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
8682
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
@@ -103,8 +99,7 @@
10399
<Reference Include="System.Configuration" />
104100
<Reference Include="System.Core" />
105101
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
106-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.3\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
107-
<Private>True</Private>
102+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.6\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
108103
</Reference>
109104
<Reference Include="System.Net" />
110105
<Reference Include="System.Runtime.Caching" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="2.2.2" targetFramework="net461" />
4-
<package id="Abp.Zero" version="2.2.1" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="2.2.1" targetFramework="net461" />
3+
<package id="Abp" version="2.3.0" targetFramework="net461" />
4+
<package id="Abp.Zero" version="2.3.0" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="2.3.0" targetFramework="net461" />
66
<package id="Castle.Core" version="4.0.0" targetFramework="net461" />
77
<package id="Castle.LoggingFacility" version="4.0.0" targetFramework="net461" />
88
<package id="Castle.Windsor" version="4.0.0" targetFramework="net461" />
9-
<package id="JetBrains.Annotations" version="10.4.0" targetFramework="net452" />
9+
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net461" />
1010
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
1111
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1212
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
1313
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
14-
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
14+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
1515
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
1616
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net452" />
17-
<package id="System.Linq.Dynamic.Core" version="1.0.7.3" targetFramework="net461" />
17+
<package id="System.Linq.Dynamic.Core" version="1.0.7.6" targetFramework="net461" />
1818
</packages>

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

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,23 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.2.2.2\lib\net46\Abp.dll</HintPath>
40-
<Private>True</Private>
38+
<Reference Include="Abp, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.2.3.0\lib\net46\Abp.dll</HintPath>
4140
</Reference>
42-
<Reference Include="Abp.EntityFramework, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.EntityFramework.2.2.1\lib\net46\Abp.EntityFramework.dll</HintPath>
44-
<Private>True</Private>
41+
<Reference Include="Abp.EntityFramework, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.EntityFramework.2.3.0\lib\net46\Abp.EntityFramework.dll</HintPath>
4543
</Reference>
46-
<Reference Include="Abp.EntityFramework.Common, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Abp.EntityFramework.Common.2.2.1\lib\net46\Abp.EntityFramework.Common.dll</HintPath>
48-
<Private>True</Private>
44+
<Reference Include="Abp.EntityFramework.Common, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.EntityFramework.Common.2.3.0\lib\net46\Abp.EntityFramework.Common.dll</HintPath>
4946
</Reference>
50-
<Reference Include="Abp.Zero, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Abp.Zero.2.2.1\lib\net46\Abp.Zero.dll</HintPath>
52-
<Private>True</Private>
47+
<Reference Include="Abp.Zero, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.2.3.0\lib\net46\Abp.Zero.dll</HintPath>
5349
</Reference>
54-
<Reference Include="Abp.Zero.Common, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Abp.Zero.Common.2.2.1\lib\net46\Abp.Zero.Common.dll</HintPath>
56-
<Private>True</Private>
50+
<Reference Include="Abp.Zero.Common, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Abp.Zero.Common.2.3.0\lib\net46\Abp.Zero.Common.dll</HintPath>
5752
</Reference>
58-
<Reference Include="Abp.Zero.EntityFramework, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
59-
<HintPath>..\packages\Abp.Zero.EntityFramework.2.2.1\lib\net46\Abp.Zero.EntityFramework.dll</HintPath>
60-
<Private>True</Private>
53+
<Reference Include="Abp.Zero.EntityFramework, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Abp.Zero.EntityFramework.2.3.0\lib\net46\Abp.Zero.EntityFramework.dll</HintPath>
6155
</Reference>
6256
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
6357
<HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
@@ -75,17 +69,15 @@
7569
<SpecificVersion>False</SpecificVersion>
7670
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
7771
</Reference>
78-
<Reference Include="EntityFramework.DynamicFilters, Version=2.7.0.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
79-
<HintPath>..\packages\EntityFramework.DynamicFilters.2.7.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
80-
<Private>True</Private>
72+
<Reference Include="EntityFramework.DynamicFilters, Version=2.10.0.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
73+
<HintPath>..\packages\EntityFramework.DynamicFilters.2.10.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
8174
</Reference>
8275
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
8376
<SpecificVersion>False</SpecificVersion>
8477
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
8578
</Reference>
86-
<Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
87-
<HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
88-
<Private>True</Private>
79+
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
80+
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
8981
</Reference>
9082
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9183
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
@@ -104,7 +96,7 @@
10496
<Private>True</Private>
10597
</Reference>
10698
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
107-
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
99+
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
108100
</Reference>
109101
<Reference Include="Nito.AsyncEx, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
110102
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
@@ -127,8 +119,7 @@
127119
<Reference Include="System.Configuration" />
128120
<Reference Include="System.Core" />
129121
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
130-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.3\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
131-
<Private>True</Private>
122+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.6\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
132123
</Reference>
133124
<Reference Include="System.Net" />
134125
<Reference Include="System.Runtime.Caching" />

0 commit comments

Comments
 (0)