Skip to content

Commit 37de1f0

Browse files
ismcagdasismcagdas
authored
Merge pull request #98 from aspnetboilerplate/upgrade-abp-to-5-4
Upgrade to Abp v5.4 and upgrade other packages
2 parents fa3d3f5 + e77a24a commit 37de1f0

File tree

21 files changed

+302
-302
lines changed

21 files changed

+302
-302
lines changed

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

Lines changed: 18 additions & 18 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.2.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.5.2.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.5.4.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.5.2.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.5.4.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>
@@ -62,23 +62,23 @@
6262
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
6363
<HintPath>..\packages\JetBrains.Annotations.2019.1.3\lib\net20\JetBrains.Annotations.dll</HintPath>
6464
</Reference>
65-
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
65+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
6767
</Reference>
68-
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
68+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
71+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.2\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
7373
</Reference>
74-
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75-
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
74+
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
7676
</Reference>
77-
<Reference Include="Microsoft.Extensions.Options, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Microsoft.Extensions.Options.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
77+
<Reference Include="Microsoft.Extensions.Options, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.Extensions.Options.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
7979
</Reference>
80-
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
81-
<HintPath>..\packages\Microsoft.Extensions.Primitives.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
80+
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Microsoft.Extensions.Primitives.3.1.2\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>
@@ -142,8 +142,8 @@
142142
<Reference Include="System.Data.OracleClient" />
143143
<Reference Include="System.Drawing" />
144144
<Reference Include="System.IO.Compression.FileSystem" />
145-
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.20.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
146-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.20\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
145+
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.22.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
146+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.22\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
147147
</Reference>
148148
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
149149
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -244,19 +244,19 @@
244244
</dependentAssembly>
245245
<dependentAssembly>
246246
<assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
247-
<bindingRedirect oldVersion="0.0.0.0-2.1.2.0" newVersion="2.1.2.0" />
247+
<bindingRedirect oldVersion="0.0.0.0-3.1.2.0" newVersion="3.1.2.0" />
248248
</dependentAssembly>
249249
<dependentAssembly>
250250
<assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
251-
<bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0" />
251+
<bindingRedirect oldVersion="0.0.0.0-3.1.2.0" newVersion="3.1.2.0" />
252252
</dependentAssembly>
253253
<dependentAssembly>
254254
<assemblyIdentity name="System.Linq.Dynamic.Core" publicKeyToken="0f07ec44de6ac832" culture="neutral" />
255-
<bindingRedirect oldVersion="0.0.0.0-1.0.17.0" newVersion="1.0.17.0" />
255+
<bindingRedirect oldVersion="0.0.0.0-1.0.22.0" newVersion="1.0.22.0" />
256256
</dependentAssembly>
257257
<dependentAssembly>
258258
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
259-
<bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0" />
259+
<bindingRedirect oldVersion="0.0.0.0-3.1.2.0" newVersion="3.1.2.0" />
260260
</dependentAssembly>
261261
<dependentAssembly>
262262
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -272,15 +272,15 @@
272272
</dependentAssembly>
273273
<dependentAssembly>
274274
<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
275-
<bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0" />
275+
<bindingRedirect oldVersion="0.0.0.0-3.1.2.0" newVersion="3.1.2.0" />
276276
</dependentAssembly>
277277
<dependentAssembly>
278278
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
279-
<bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0" />
279+
<bindingRedirect oldVersion="0.0.0.0-3.1.2.0" newVersion="3.1.2.0" />
280280
</dependentAssembly>
281281
<dependentAssembly>
282282
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
283-
<bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0" />
283+
<bindingRedirect oldVersion="0.0.0.0-3.1.2.0" newVersion="3.1.2.0" />
284284
</dependentAssembly>
285285
</assemblyBinding>
286286
</runtime>

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

Lines changed: 9 additions & 9 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.2.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="5.2.0" targetFramework="net461" />
3+
<package id="Abp" version="5.4.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="5.4.0" targetFramework="net461" />
55
<package id="AutoMapper" version="9.0.0" targetFramework="net461" />
66
<package id="AutoMapper.Collection" version="6.0.0" targetFramework="net461" />
77
<package id="Castle.Core" version="4.4.0" targetFramework="net461" />
@@ -12,12 +12,12 @@
1212
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1313
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
1414
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
15-
<package id="Microsoft.Extensions.Caching.Abstractions" version="3.1.1" targetFramework="net461" />
16-
<package id="Microsoft.Extensions.Caching.Memory" version="3.1.1" targetFramework="net461" />
17-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.1" targetFramework="net461" />
18-
<package id="Microsoft.Extensions.Logging.Abstractions" version="3.1.1" targetFramework="net461" />
19-
<package id="Microsoft.Extensions.Options" version="3.1.1" targetFramework="net461" />
20-
<package id="Microsoft.Extensions.Primitives" version="3.1.1" targetFramework="net461" />
15+
<package id="Microsoft.Extensions.Caching.Abstractions" version="3.1.2" targetFramework="net461" />
16+
<package id="Microsoft.Extensions.Caching.Memory" version="3.1.2" targetFramework="net461" />
17+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.2" targetFramework="net461" />
18+
<package id="Microsoft.Extensions.Logging.Abstractions" version="3.1.2" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.Options" version="3.1.2" targetFramework="net461" />
20+
<package id="Microsoft.Extensions.Primitives" version="3.1.2" targetFramework="net461" />
2121
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
2222
<package id="Nito.AsyncEx" version="5.0.0" targetFramework="net461" />
2323
<package id="Nito.AsyncEx.Context" version="5.0.0" targetFramework="net461" />
@@ -33,7 +33,7 @@
3333
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net461" />
3434
<package id="System.Configuration.ConfigurationManager" version="4.7.0" targetFramework="net461" />
3535
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
36-
<package id="System.Linq.Dynamic.Core" version="1.0.20" targetFramework="net461" />
36+
<package id="System.Linq.Dynamic.Core" version="1.0.22" targetFramework="net461" />
3737
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3838
<package id="System.Memory" version="4.5.3" targetFramework="net461" />
3939
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.5.2.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.5.4.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
4141
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4242
<HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
@@ -53,23 +53,23 @@
5353
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
5454
<HintPath>..\packages\JetBrains.Annotations.2019.1.3\lib\net20\JetBrains.Annotations.dll</HintPath>
5555
</Reference>
56-
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
56+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
57+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
5858
</Reference>
59-
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
60-
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
59+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
6161
</Reference>
62-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
62+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.2\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
6464
</Reference>
65-
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
65+
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
6767
</Reference>
68-
<Reference Include="Microsoft.Extensions.Options, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Microsoft.Extensions.Options.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
68+
<Reference Include="Microsoft.Extensions.Options, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Microsoft.Extensions.Options.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Microsoft.Extensions.Primitives.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
71+
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Extensions.Primitives.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
7373
</Reference>
7474
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7575
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -133,8 +133,8 @@
133133
<Reference Include="System.Data.OracleClient" />
134134
<Reference Include="System.Drawing" />
135135
<Reference Include="System.IO.Compression.FileSystem" />
136-
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.20.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
137-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.20\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
136+
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.22.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
137+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.22\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
138138
</Reference>
139139
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
140140
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>

0 commit comments

Comments
 (0)