Skip to content

Commit d41e165

Browse files
ismcagdasismcagdas
authored
Merge pull request #99 from aspnetboilerplate/upgrade-to-abp-5-9
upgrade-to-abp-5-9
2 parents 37de1f0 + ed14faa commit d41e165

31 files changed

+502
-464
lines changed

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

+25-25
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.4.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.5.4.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=5.9.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.5.9.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
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>
41+
<Reference Include="Abp.AutoMapper, Version=5.9.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.5.9.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>
@@ -48,7 +48,7 @@
4848
<HintPath>..\packages\AutoMapper.Collection.6.0.0\lib\net461\AutoMapper.Collection.dll</HintPath>
4949
</Reference>
5050
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
51+
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Castle.Core.AsyncInterceptor, Version=2.0.21.0, Culture=neutral, PublicKeyToken=e33b67d3bb5581e4, processorArchitecture=MSIL">
5454
<HintPath>..\packages\Castle.Core.AsyncInterceptor.2.0.21-alpha\lib\net45\Castle.Core.AsyncInterceptor.dll</HintPath>
@@ -59,26 +59,26 @@
5959
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
6060
<HintPath>..\packages\Castle.Windsor.5.0.1\lib\net45\Castle.Windsor.dll</HintPath>
6161
</Reference>
62-
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
63-
<HintPath>..\packages\JetBrains.Annotations.2019.1.3\lib\net20\JetBrains.Annotations.dll</HintPath>
62+
<Reference Include="JetBrains.Annotations, Version=2020.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
63+
<HintPath>..\packages\JetBrains.Annotations.2020.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
6464
</Reference>
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>
65+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
6767
</Reference>
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>
68+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
7070
</Reference>
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>
71+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.4\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
7373
</Reference>
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>
74+
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
7676
</Reference>
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>
77+
<Reference Include="Microsoft.Extensions.Options, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.Extensions.Options.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
7979
</Reference>
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>
80+
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Microsoft.Extensions.Primitives.3.1.4\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>
@@ -121,10 +121,10 @@
121121
</Reference>
122122
<Reference Include="System" />
123123
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
124-
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
124+
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
125125
</Reference>
126126
<Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
127-
<HintPath>..\packages\System.Collections.Immutable.1.7.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
127+
<HintPath>..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
128128
</Reference>
129129
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
130130
<HintPath>..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
@@ -142,11 +142,11 @@
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.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>
145+
<Reference Include="System.Linq.Dynamic.Core, Version=1.1.1.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
146+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.1.1\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">
149-
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
149+
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
150150
</Reference>
151151
<Reference Include="System.Net" />
152152
<Reference Include="System.Numerics" />
@@ -155,7 +155,7 @@
155155
</Reference>
156156
<Reference Include="System.Runtime.Caching" />
157157
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
158-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
158+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
159159
</Reference>
160160
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
161161
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,15 @@
248248
</dependentAssembly>
249249
<dependentAssembly>
250250
<assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
251-
<bindingRedirect oldVersion="0.0.0.0-3.1.2.0" newVersion="3.1.2.0" />
251+
<bindingRedirect oldVersion="0.0.0.0-3.1.4.0" newVersion="3.1.4.0" />
252252
</dependentAssembly>
253253
<dependentAssembly>
254254
<assemblyIdentity name="System.Linq.Dynamic.Core" publicKeyToken="0f07ec44de6ac832" culture="neutral" />
255255
<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.2.0" newVersion="3.1.2.0" />
259+
<bindingRedirect oldVersion="0.0.0.0-3.1.4.0" newVersion="3.1.4.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.2.0" newVersion="3.1.2.0" />
275+
<bindingRedirect oldVersion="0.0.0.0-3.1.4.0" newVersion="3.1.4.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.2.0" newVersion="3.1.2.0" />
279+
<bindingRedirect oldVersion="0.0.0.0-3.1.4.0" newVersion="3.1.4.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.2.0" newVersion="3.1.2.0" />
283+
<bindingRedirect oldVersion="0.0.0.0-3.1.4.0" newVersion="3.1.4.0" />
284284
</dependentAssembly>
285285
</assemblyBinding>
286286
</runtime>

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="5.4.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="5.4.0" targetFramework="net461" />
3+
<package id="Abp" version="5.9.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="5.9.0" targetFramework="net461" />
55
<package id="AutoMapper" version="9.0.0" targetFramework="net461" />
66
<package id="AutoMapper.Collection" version="6.0.0" targetFramework="net461" />
7-
<package id="Castle.Core" version="4.4.0" targetFramework="net461" />
7+
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
88
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
99
<package id="Castle.LoggingFacility" version="5.0.1" targetFramework="net461" />
1010
<package id="Castle.Windsor" version="5.0.1" targetFramework="net461" />
11-
<package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net461" />
11+
<package id="JetBrains.Annotations" version="2020.1.0" targetFramework="net461" />
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.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" />
15+
<package id="Microsoft.Extensions.Caching.Abstractions" version="3.1.4" targetFramework="net461" />
16+
<package id="Microsoft.Extensions.Caching.Memory" version="3.1.4" targetFramework="net461" />
17+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.4" targetFramework="net461" />
18+
<package id="Microsoft.Extensions.Logging.Abstractions" version="3.1.4" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.Options" version="3.1.4" targetFramework="net461" />
20+
<package id="Microsoft.Extensions.Primitives" version="3.1.4" 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" />
@@ -28,16 +28,16 @@
2828
<package id="Nito.Cancellation" version="1.0.5" targetFramework="net461" />
2929
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
3030
<package id="Nito.Disposables" version="2.0.1" targetFramework="net461" />
31-
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
32-
<package id="System.Collections.Immutable" version="1.7.0" targetFramework="net461" />
31+
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
32+
<package id="System.Collections.Immutable" version="1.7.1" targetFramework="net461" />
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.22" targetFramework="net461" />
36+
<package id="System.Linq.Dynamic.Core" version="1.1.1" targetFramework="net461" />
3737
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
38-
<package id="System.Memory" version="4.5.3" targetFramework="net461" />
38+
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
3939
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
40-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net461" />
40+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net461" />
4141
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
4242
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
4343
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />

0 commit comments

Comments
 (0)