Skip to content

Commit a0d2bee

Browse files
ismcagdasismcagdas
committed
resolved #130: Upgraded to ABP to v3.7.2
1 parent 3cf519c commit a0d2bee

File tree

27 files changed

+767
-508
lines changed

27 files changed

+767
-508
lines changed

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

Lines changed: 47 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=3.6.1.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.6.1\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.7.2\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=3.6.1.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.3.6.1\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.3.7.2\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=3.6.1.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.3.6.1\lib\net461\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.3.7.2\lib\net461\Abp.Zero.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=3.6.1.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.Common.3.6.1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
47+
<Reference Include="Abp.Zero.Common, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.3.7.2\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4949
</Reference>
5050
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5151
<HintPath>..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
@@ -65,20 +65,20 @@
6565
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
6767
</Reference>
68-
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
68+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
71+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
7373
</Reference>
74-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75-
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
74+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
7676
</Reference>
77-
<Reference Include="Microsoft.Extensions.Options, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Microsoft.Extensions.Options.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
77+
<Reference Include="Microsoft.Extensions.Options, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.Extensions.Options.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
7979
</Reference>
80-
<Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
81-
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
80+
<Reference Include="Microsoft.Extensions.Primitives, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
8282
</Reference>
8383
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8484
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -117,32 +117,42 @@
117117
<HintPath>..\packages\Nito.Disposables.1.2.3\lib\netstandard2.0\Nito.Disposables.dll</HintPath>
118118
</Reference>
119119
<Reference Include="System" />
120-
<Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
121-
<HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
120+
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
121+
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
122122
</Reference>
123-
<Reference Include="System.ComponentModel.Annotations, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
124-
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
123+
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
124+
<HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
125+
</Reference>
126+
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
127+
<HintPath>..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
125128
</Reference>
126129
<Reference Include="System.ComponentModel.DataAnnotations" />
127130
<Reference Include="System.Configuration" />
128-
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
129-
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.1\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
131+
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
132+
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.5.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
130133
</Reference>
131134
<Reference Include="System.Core" />
132135
<Reference Include="System.Data.Common, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
133136
<HintPath>..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
134137
<Private>True</Private>
135138
</Reference>
139+
<Reference Include="System.Data.OracleClient" />
136140
<Reference Include="System.Drawing" />
137141
<Reference Include="System.IO.Compression.FileSystem" />
138142
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
139-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.6\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
143+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.9\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
144+
</Reference>
145+
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
146+
<HintPath>..\packages\System.Memory.4.5.0\lib\netstandard2.0\System.Memory.dll</HintPath>
140147
</Reference>
141148
<Reference Include="System.Net" />
142149
<Reference Include="System.Numerics" />
150+
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
151+
<HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
152+
</Reference>
143153
<Reference Include="System.Runtime.Caching" />
144-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
145-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
154+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
155+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
146156
</Reference>
147157
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
148158
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
@@ -158,10 +168,20 @@
158168
<HintPath>..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll</HintPath>
159169
<Private>True</Private>
160170
</Reference>
171+
<Reference Include="System.Security.AccessControl, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
172+
<HintPath>..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll</HintPath>
173+
</Reference>
161174
<Reference Include="System.Security.Claims, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
162175
<HintPath>..\packages\System.Security.Claims.4.3.0\lib\net46\System.Security.Claims.dll</HintPath>
163176
<Private>True</Private>
164177
</Reference>
178+
<Reference Include="System.Security.Permissions, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
179+
<HintPath>..\packages\System.Security.Permissions.4.5.0\lib\net461\System.Security.Permissions.dll</HintPath>
180+
</Reference>
181+
<Reference Include="System.Security.Principal.Windows, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
182+
<HintPath>..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
183+
</Reference>
184+
<Reference Include="System.ServiceProcess" />
165185
<Reference Include="System.Transactions" />
166186
<Reference Include="System.Web" />
167187
<Reference Include="System.Xml.Linq" />

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
</dependentAssembly>
221221
<dependentAssembly>
222222
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
223-
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
223+
<bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
224224
</dependentAssembly>
225225
<dependentAssembly>
226226
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
@@ -250,6 +250,10 @@
250250
<assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
251251
<bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
252252
</dependentAssembly>
253+
<dependentAssembly>
254+
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
255+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
256+
</dependentAssembly>
253257
</assemblyBinding>
254258
</runtime>
255259
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.6.1" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="3.6.1" targetFramework="net461" />
5-
<package id="Abp.Zero" version="3.6.1" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="3.6.1" targetFramework="net461" />
3+
<package id="Abp" version="3.7.2" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="3.7.2" targetFramework="net461" />
5+
<package id="Abp.Zero" version="3.7.2" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="3.7.2" targetFramework="net461" />
77
<package id="AutoMapper" version="6.2.2" targetFramework="net461" />
88
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
99
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
@@ -13,29 +13,35 @@
1313
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
1414
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
1515
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
16-
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.0.2" targetFramework="net461" />
17-
<package id="Microsoft.Extensions.Caching.Memory" version="2.0.2" targetFramework="net461" />
18-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" />
19-
<package id="Microsoft.Extensions.Options" version="2.0.2" targetFramework="net461" />
20-
<package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
16+
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.1.0" targetFramework="net461" />
17+
<package id="Microsoft.Extensions.Caching.Memory" version="2.1.0" targetFramework="net461" />
18+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.0" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.Options" version="2.1.0" targetFramework="net461" />
20+
<package id="Microsoft.Extensions.Primitives" version="2.1.0" targetFramework="net461" />
2121
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
2222
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net461" />
2323
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
2424
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />
2525
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net461" />
2626
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
2727
<package id="Nito.Disposables" version="1.2.3" targetFramework="net461" />
28-
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
29-
<package id="System.ComponentModel.Annotations" version="4.4.1" targetFramework="net461" />
30-
<package id="System.Configuration.ConfigurationManager" version="4.4.1" targetFramework="net461" />
28+
<package id="System.Buffers" version="4.4.0" targetFramework="net461" />
29+
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
30+
<package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
31+
<package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net461" />
3132
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
32-
<package id="System.Linq.Dynamic.Core" version="1.0.8.6" targetFramework="net461" />
33+
<package id="System.Linq.Dynamic.Core" version="1.0.8.9" targetFramework="net461" />
3334
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
34-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
35+
<package id="System.Memory" version="4.5.0" targetFramework="net461" />
36+
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
37+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net461" />
3538
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
3639
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
3740
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
41+
<package id="System.Security.AccessControl" version="4.5.0" targetFramework="net461" />
3842
<package id="System.Security.Claims" version="4.3.0" targetFramework="net461" />
43+
<package id="System.Security.Permissions" version="4.5.0" targetFramework="net461" />
44+
<package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net461" />
3945
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
4046
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
4147
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />

0 commit comments

Comments
 (0)