Skip to content

Commit 108addb

Browse files
ismcagdasismcagdas
authored
Merge pull request #185 from aspnetboilerplate/feat/abp6.0
Upgraded to ABP 6.0
2 parents 442ba2f + f411d94 commit 108addb

File tree

32 files changed

+1223
-972
lines changed

32 files changed

+1223
-972
lines changed

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

Lines changed: 59 additions & 58 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
</dependentAssembly>
217217
<dependentAssembly>
218218
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
219-
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
219+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
220220
</dependentAssembly>
221221
<dependentAssembly>
222222
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" 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.6.0" newVersion="4.0.6.0" />
263+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
264264
</dependentAssembly>
265265
<dependentAssembly>
266266
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="5.13.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="5.13.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="5.13.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="5.13.0" targetFramework="net461" />
7-
<package id="AutoMapper" version="10.0.0" targetFramework="net461" />
3+
<package id="Abp" version="6.0.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="6.0.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="6.0.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="6.0.0" targetFramework="net461" />
7+
<package id="AutoMapper" version="10.1.1" targetFramework="net461" />
88
<package id="AutoMapper.Collection" version="7.0.0" targetFramework="net461" />
99
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
1010
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
11-
<package id="Castle.LoggingFacility" version="5.0.1" targetFramework="net461" />
12-
<package id="Castle.Windsor" version="5.0.1" targetFramework="net461" />
13-
<package id="JetBrains.Annotations" version="2020.1.0" targetFramework="net461" />
11+
<package id="Castle.LoggingFacility" version="5.1.0-beta001" targetFramework="net461" />
12+
<package id="Castle.Windsor" version="5.1.0-beta001" targetFramework="net461" />
13+
<package id="JetBrains.Annotations" version="2020.2.0-eap" targetFramework="net461" />
1414
<package id="Microsoft.AspNet.Identity.Core" version="2.2.3" targetFramework="net461" />
1515
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
1616
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
1717
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
18-
<package id="Microsoft.Extensions.Caching.Abstractions" version="3.1.5" targetFramework="net461" />
19-
<package id="Microsoft.Extensions.Caching.Memory" version="3.1.5" targetFramework="net461" />
20-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.5" targetFramework="net461" />
21-
<package id="Microsoft.Extensions.Logging.Abstractions" version="3.1.5" targetFramework="net461" />
22-
<package id="Microsoft.Extensions.Options" version="3.1.5" targetFramework="net461" />
23-
<package id="Microsoft.Extensions.Primitives" version="3.1.5" targetFramework="net461" />
18+
<package id="Microsoft.Extensions.Caching.Abstractions" version="5.0.0" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.Caching.Memory" version="5.0.0" targetFramework="net461" />
20+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="5.0.0" targetFramework="net461" />
21+
<package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net461" />
22+
<package id="Microsoft.Extensions.Options" version="5.0.0" targetFramework="net461" />
23+
<package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net461" />
2424
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
25-
<package id="Nito.AsyncEx" version="5.0.0" targetFramework="net461" />
26-
<package id="Nito.AsyncEx.Context" version="5.0.0" targetFramework="net461" />
27-
<package id="Nito.AsyncEx.Coordination" version="5.0.0" targetFramework="net461" />
28-
<package id="Nito.AsyncEx.Interop.WaitHandles" version="5.0.0" targetFramework="net461" />
29-
<package id="Nito.AsyncEx.Oop" version="5.0.0" targetFramework="net461" />
30-
<package id="Nito.AsyncEx.Tasks" version="5.0.0" targetFramework="net461" />
31-
<package id="Nito.Cancellation" version="1.0.5" targetFramework="net461" />
32-
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
33-
<package id="Nito.Disposables" version="2.0.1" targetFramework="net461" />
25+
<package id="Nito.AsyncEx" version="5.1.0" targetFramework="net461" />
26+
<package id="Nito.AsyncEx.Context" version="5.1.0" targetFramework="net461" />
27+
<package id="Nito.AsyncEx.Coordination" version="5.1.0" targetFramework="net461" />
28+
<package id="Nito.AsyncEx.Interop.WaitHandles" version="5.1.0" targetFramework="net461" />
29+
<package id="Nito.AsyncEx.Oop" version="5.1.0" targetFramework="net461" />
30+
<package id="Nito.AsyncEx.Tasks" version="5.1.0" targetFramework="net461" />
31+
<package id="Nito.Cancellation" version="1.1.0" targetFramework="net461" />
32+
<package id="Nito.Collections.Deque" version="1.1.0" targetFramework="net461" />
33+
<package id="Nito.Disposables" version="2.2.0" targetFramework="net461" />
3434
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
35-
<package id="System.Collections.Immutable" version="1.7.1" targetFramework="net461" />
36-
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net461" />
37-
<package id="System.Configuration.ConfigurationManager" version="4.7.0" targetFramework="net461" />
35+
<package id="System.Collections.Immutable" version="5.0.0" targetFramework="net461" />
36+
<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net461" />
37+
<package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net461" />
3838
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
39-
<package id="System.Linq.Dynamic.Core" version="1.1.5" targetFramework="net461" />
39+
<package id="System.Linq.Dynamic.Core" version="1.2.5" targetFramework="net461" />
4040
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
4141
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
4242
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
43-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net461" />
43+
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net461" />
4444
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
4545
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
4646
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
47-
<package id="System.Security.AccessControl" version="4.7.0" targetFramework="net461" />
47+
<package id="System.Security.AccessControl" version="5.0.0" targetFramework="net461" />
4848
<package id="System.Security.Claims" version="4.3.0" targetFramework="net461" />
49-
<package id="System.Security.Permissions" version="4.7.0" targetFramework="net461" />
50-
<package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net461" />
49+
<package id="System.Security.Permissions" version="5.0.0" targetFramework="net461" />
50+
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net461" />
5151
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
5252
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
5353
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
5454
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
5555
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
56-
<package id="TimeZoneConverter" version="3.2.0" targetFramework="net461" />
56+
<package id="TimeZoneConverter" version="3.3.0" targetFramework="net461" />
5757
</packages>

0 commit comments

Comments
 (0)