Skip to content

Commit 9553a3e

Browse files
ismcagdasismcagdas
authored
Merge pull request #138 from aspnetboilerplate/abp-upgrade-381
Abp upgrade v3.8.1
2 parents 71f60fe + 9f18486 commit 9553a3e

File tree

33 files changed

+744
-482
lines changed

33 files changed

+744
-482
lines changed

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

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,26 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
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>
38+
<Reference Include="Abp, Version=3.8.1.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.8.1\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
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>
41+
<Reference Include="Abp.AutoMapper, Version=3.8.1.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.3.8.1\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
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>
44+
<Reference Include="Abp.Zero, Version=3.8.1.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.3.8.1\lib\net461\Abp.Zero.dll</HintPath>
4646
</Reference>
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>
47+
<Reference Include="Abp.Zero.Common, Version=3.8.1.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.3.8.1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4949
</Reference>
50-
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51-
<HintPath>..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
50+
<Reference Include="AutoMapper, Version=7.0.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51+
<HintPath>..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll</HintPath>
52+
</Reference>
53+
<Reference Include="AutoMapper.Collection, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e57c3f0a3d6646db, processorArchitecture=MSIL">
54+
<HintPath>..\packages\AutoMapper.Collection.4.0.0\lib\net45\AutoMapper.Collection.dll</HintPath>
5255
</Reference>
5356
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
57+
<HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
5558
</Reference>
5659
<Reference Include="Castle.Facilities.Logging, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5760
<HintPath>..\packages\Castle.LoggingFacility.4.1.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
@@ -63,22 +66,22 @@
6366
<HintPath>..\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
6467
</Reference>
6568
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
69+
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
6770
</Reference>
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>
71+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
7073
</Reference>
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>
74+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
7376
</Reference>
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>
77+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
7679
</Reference>
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>
80+
<Reference Include="Microsoft.Extensions.Options, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Microsoft.Extensions.Options.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
7982
</Reference>
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>
83+
<Reference Include="Microsoft.Extensions.Primitives, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
84+
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
8285
</Reference>
8386
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8487
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -140,10 +143,10 @@
140143
<Reference Include="System.Drawing" />
141144
<Reference Include="System.IO.Compression.FileSystem" />
142145
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
143-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.9\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
146+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.11\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
144147
</Reference>
145148
<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>
149+
<HintPath>..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
147150
</Reference>
148151
<Reference Include="System.Net" />
149152
<Reference Include="System.Numerics" />
@@ -152,7 +155,7 @@
152155
</Reference>
153156
<Reference Include="System.Runtime.Caching" />
154157
<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>
158+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
156159
</Reference>
157160
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
158161
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
@@ -183,6 +186,9 @@
183186
</Reference>
184187
<Reference Include="System.ServiceProcess" />
185188
<Reference Include="System.Transactions" />
189+
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
190+
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
191+
</Reference>
186192
<Reference Include="System.Web" />
187193
<Reference Include="System.Xml.Linq" />
188194
<Reference Include="System.Data.DataSetExtensions" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
</dependentAssembly>
225225
<dependentAssembly>
226226
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
227-
<bindingRedirect oldVersion="0.0.0.0-6.2.1.0" newVersion="6.2.1.0" />
227+
<bindingRedirect oldVersion="0.0.0.0-7.0.1.0" newVersion="7.0.1.0" />
228228
</dependentAssembly>
229229
<dependentAssembly>
230230
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

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

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
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" />
7-
<package id="AutoMapper" version="6.2.2" targetFramework="net461" />
8-
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
3+
<package id="Abp" version="3.8.1" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="3.8.1" targetFramework="net461" />
5+
<package id="Abp.Zero" version="3.8.1" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="3.8.1" targetFramework="net461" />
7+
<package id="AutoMapper" version="7.0.1" targetFramework="net461" />
8+
<package id="AutoMapper.Collection" version="4.0.0" targetFramework="net461" />
9+
<package id="Castle.Core" version="4.3.1" targetFramework="net461" />
910
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
1011
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
1112
<package id="JetBrains.Annotations" version="11.1.0" targetFramework="net461" />
12-
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net461" />
13+
<package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net461" />
1314
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
1415
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
1516
<package id="Microsoft.Bcl.Build" version="1.0.21" 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" />
17+
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.1.1" targetFramework="net461" />
18+
<package id="Microsoft.Extensions.Caching.Memory" version="2.1.1" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net461" />
20+
<package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net461" />
21+
<package id="Microsoft.Extensions.Primitives" version="2.1.1" targetFramework="net461" />
2122
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
2223
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net461" />
2324
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
@@ -30,11 +31,11 @@
3031
<package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
3132
<package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net461" />
3233
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
33-
<package id="System.Linq.Dynamic.Core" version="1.0.8.9" targetFramework="net461" />
34+
<package id="System.Linq.Dynamic.Core" version="1.0.8.11" targetFramework="net461" />
3435
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
35-
<package id="System.Memory" version="4.5.0" targetFramework="net461" />
36+
<package id="System.Memory" version="4.5.1" targetFramework="net461" />
3637
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
37-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net461" />
38+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
3839
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
3940
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
4041
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
@@ -43,6 +44,7 @@
4344
<package id="System.Security.Permissions" version="4.5.0" targetFramework="net461" />
4445
<package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net461" />
4546
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
47+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
4648
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
4749
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
4850
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />

0 commit comments

Comments
 (0)