Skip to content

Commit 1bc7020

Browse files
ismcagdasismcagdas
authored
Merge pull request #96 from aspnetboilerplate/upgarde-to-abp-5-1-0
upgrade abp packages to 5.1.0 and other packages to latest
2 parents 40fc0d9 + cd23bc5 commit 1bc7020

33 files changed

+546
-480
lines changed

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

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.5.0.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.5.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.5.0.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.5.1.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
4444
<Reference Include="AutoMapper, Version=9.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
4545
<HintPath>..\packages\AutoMapper.9.0.0\lib\net461\AutoMapper.dll</HintPath>
@@ -59,23 +59,23 @@
5959
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
6060
<HintPath>..\packages\JetBrains.Annotations.2019.1.3\lib\net20\JetBrains.Annotations.dll</HintPath>
6161
</Reference>
62-
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
62+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
6464
</Reference>
65-
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
65+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
6767
</Reference>
68-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
68+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
71+
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
7373
</Reference>
74-
<Reference Include="Microsoft.Extensions.Options, Version=3.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75-
<HintPath>..\packages\Microsoft.Extensions.Options.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
74+
<Reference Include="Microsoft.Extensions.Options, Version=3.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.Extensions.Options.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
7676
</Reference>
77-
<Reference Include="Microsoft.Extensions.Primitives, Version=3.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Microsoft.Extensions.Primitives.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
77+
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.Extensions.Primitives.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
7979
</Reference>
8080
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8181
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -90,7 +90,7 @@
9090
<Private>True</Private>
9191
</Reference>
9292
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
93-
<HintPath>..\packages\Newtonsoft.Json.12.0.3-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
93+
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
9494
</Reference>
9595
<Reference Include="Nito.AsyncEx.Context, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
9696
<HintPath>..\packages\Nito.AsyncEx.Context.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Context.dll</HintPath>
@@ -120,16 +120,16 @@
120120
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
121121
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
122122
</Reference>
123-
<Reference Include="System.Collections.Immutable, Version=1.2.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
124-
<HintPath>..\packages\System.Collections.Immutable.1.6.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
123+
<Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
124+
<HintPath>..\packages\System.Collections.Immutable.1.7.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
125125
</Reference>
126126
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
127-
<HintPath>..\packages\System.ComponentModel.Annotations.4.6.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
127+
<HintPath>..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
128128
</Reference>
129129
<Reference Include="System.ComponentModel.DataAnnotations" />
130130
<Reference Include="System.Configuration" />
131-
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
132-
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.6.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
131+
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
132+
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.7.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
133133
</Reference>
134134
<Reference Include="System.Core" />
135135
<Reference Include="System.Data.Common">
@@ -151,8 +151,8 @@
151151
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
152152
</Reference>
153153
<Reference Include="System.Runtime.Caching" />
154-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
155-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
154+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
155+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
156156
</Reference>
157157
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
158158
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
@@ -169,18 +169,18 @@
169169
<Private>True</Private>
170170
</Reference>
171171
<Reference Include="System.Security" />
172-
<Reference Include="System.Security.AccessControl, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
173-
<HintPath>..\packages\System.Security.AccessControl.4.6.0\lib\net461\System.Security.AccessControl.dll</HintPath>
172+
<Reference Include="System.Security.AccessControl, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
173+
<HintPath>..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll</HintPath>
174174
</Reference>
175175
<Reference Include="System.Security.Claims">
176176
<HintPath>..\packages\System.Security.Claims.4.3.0\lib\net46\System.Security.Claims.dll</HintPath>
177177
<Private>True</Private>
178178
</Reference>
179-
<Reference Include="System.Security.Permissions, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
180-
<HintPath>..\packages\System.Security.Permissions.4.6.0\lib\net461\System.Security.Permissions.dll</HintPath>
179+
<Reference Include="System.Security.Permissions, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
180+
<HintPath>..\packages\System.Security.Permissions.4.7.0\lib\net461\System.Security.Permissions.dll</HintPath>
181181
</Reference>
182-
<Reference Include="System.Security.Principal.Windows, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
183-
<HintPath>..\packages\System.Security.Principal.Windows.4.6.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
182+
<Reference Include="System.Security.Principal.Windows, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
183+
<HintPath>..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
184184
</Reference>
185185
<Reference Include="System.ServiceProcess" />
186186
<Reference Include="System.Transactions" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
</dependentAssembly>
213213
<dependentAssembly>
214214
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
215-
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
215+
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
216216
</dependentAssembly>
217217
<dependentAssembly>
218218
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
@@ -260,7 +260,7 @@
260260
</dependentAssembly>
261261
<dependentAssembly>
262262
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
263-
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
263+
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
264264
</dependentAssembly>
265265
<dependentAssembly>
266266
<assemblyIdentity name="TimeZoneConverter" publicKeyToken="e20ab7d0d9479841" culture="neutral" />

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="5.0.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="5.0.0" targetFramework="net461" />
3+
<package id="Abp" version="5.1.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="5.1.0" targetFramework="net461" />
55
<package id="AutoMapper" version="9.0.0" targetFramework="net461" />
66
<package id="AutoMapper.Collection" version="5.0.0" targetFramework="net461" />
77
<package id="Castle.Core" version="4.4.0" targetFramework="net461" />
@@ -11,13 +11,13 @@
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="Microsoft.Extensions.Caching.Abstractions" version="3.0.0" targetFramework="net461" />
15-
<package id="Microsoft.Extensions.Caching.Memory" version="3.0.0" targetFramework="net461" />
16-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.0.0" targetFramework="net461" />
17-
<package id="Microsoft.Extensions.Logging.Abstractions" version="3.0.0" targetFramework="net461" />
18-
<package id="Microsoft.Extensions.Options" version="3.0.0" targetFramework="net461" />
19-
<package id="Microsoft.Extensions.Primitives" version="3.0.0" targetFramework="net461" />
20-
<package id="Newtonsoft.Json" version="12.0.3-beta1" targetFramework="net461" />
14+
<package id="Microsoft.Extensions.Caching.Abstractions" version="3.1.0" targetFramework="net461" />
15+
<package id="Microsoft.Extensions.Caching.Memory" version="3.1.0" targetFramework="net461" />
16+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.0" targetFramework="net461" />
17+
<package id="Microsoft.Extensions.Logging.Abstractions" version="3.1.0" targetFramework="net461" />
18+
<package id="Microsoft.Extensions.Options" version="3.1.0" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.Primitives" version="3.1.0" targetFramework="net461" />
20+
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
2121
<package id="Nito.AsyncEx" version="5.0.0" targetFramework="net461" />
2222
<package id="Nito.AsyncEx.Context" version="5.0.0" targetFramework="net461" />
2323
<package id="Nito.AsyncEx.Coordination" version="5.0.0" targetFramework="net461" />
@@ -28,22 +28,22 @@
2828
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
2929
<package id="Nito.Disposables" version="2.0.1" targetFramework="net461" />
3030
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
31-
<package id="System.Collections.Immutable" version="1.6.0" targetFramework="net461" />
32-
<package id="System.ComponentModel.Annotations" version="4.6.0" targetFramework="net461" />
33-
<package id="System.Configuration.ConfigurationManager" version="4.6.0" targetFramework="net461" />
31+
<package id="System.Collections.Immutable" version="1.7.0" targetFramework="net461" />
32+
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net461" />
33+
<package id="System.Configuration.ConfigurationManager" version="4.7.0" targetFramework="net461" />
3434
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
3535
<package id="System.Linq.Dynamic.Core" version="1.0.19" targetFramework="net461" />
3636
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3737
<package id="System.Memory" version="4.5.3" targetFramework="net461" />
3838
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
39-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net461" />
39+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net461" />
4040
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
4141
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
4242
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
43-
<package id="System.Security.AccessControl" version="4.6.0" targetFramework="net461" />
43+
<package id="System.Security.AccessControl" version="4.7.0" targetFramework="net461" />
4444
<package id="System.Security.Claims" version="4.3.0" targetFramework="net461" />
45-
<package id="System.Security.Permissions" version="4.6.0" targetFramework="net461" />
46-
<package id="System.Security.Principal.Windows" version="4.6.0" targetFramework="net461" />
45+
<package id="System.Security.Permissions" version="4.7.0" targetFramework="net461" />
46+
<package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net461" />
4747
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
4848
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
4949
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />

0 commit comments

Comments
 (0)