Skip to content

Commit d236c36

Browse files
ismcagdasismcagdas
authored
Merge pull request #183 from aspnetboilerplate/upgrade-to-abp-5-9
upgrade-to-abp-5-9
2 parents 81d045d + 1bbe764 commit d236c36

33 files changed

+630
-594
lines changed

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

+29-29
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@
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>
44-
<Reference Include="Abp.Zero, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.5.4.0\lib\net461\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=5.9.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.5.9.0\lib\net461\Abp.Zero.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.Common.5.4.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
47+
<Reference Include="Abp.Zero.Common, Version=5.9.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.5.9.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4949
</Reference>
5050
<Reference Include="AutoMapper, Version=9.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5151
<HintPath>..\packages\AutoMapper.9.0.0\lib\net461\AutoMapper.dll</HintPath>
@@ -54,7 +54,7 @@
5454
<HintPath>..\packages\AutoMapper.Collection.6.0.0\lib\net461\AutoMapper.Collection.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
57+
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Castle.Core.AsyncInterceptor, Version=2.0.21.0, Culture=neutral, PublicKeyToken=e33b67d3bb5581e4, processorArchitecture=MSIL">
6060
<HintPath>..\packages\Castle.Core.AsyncInterceptor.2.0.21-alpha\lib\net45\Castle.Core.AsyncInterceptor.dll</HintPath>
@@ -65,29 +65,29 @@
6565
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
6666
<HintPath>..\packages\Castle.Windsor.5.0.1\lib\net45\Castle.Windsor.dll</HintPath>
6767
</Reference>
68-
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
69-
<HintPath>..\packages\JetBrains.Annotations.2019.1.3\lib\net20\JetBrains.Annotations.dll</HintPath>
68+
<Reference Include="JetBrains.Annotations, Version=2020.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
69+
<HintPath>..\packages\JetBrains.Annotations.2020.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
7070
</Reference>
7171
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7272
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.3\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
7373
</Reference>
74-
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75-
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
74+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
7676
</Reference>
77-
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
77+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
7979
</Reference>
80-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
81-
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
80+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.4\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
8282
</Reference>
83-
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
84-
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
83+
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
84+
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
8585
</Reference>
86-
<Reference Include="Microsoft.Extensions.Options, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
87-
<HintPath>..\packages\Microsoft.Extensions.Options.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
86+
<Reference Include="Microsoft.Extensions.Options, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
87+
<HintPath>..\packages\Microsoft.Extensions.Options.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
8888
</Reference>
89-
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
90-
<HintPath>..\packages\Microsoft.Extensions.Primitives.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
89+
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
90+
<HintPath>..\packages\Microsoft.Extensions.Primitives.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
9191
</Reference>
9292
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
9393
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -127,10 +127,10 @@
127127
</Reference>
128128
<Reference Include="System" />
129129
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
130-
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
130+
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
131131
</Reference>
132132
<Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
133-
<HintPath>..\packages\System.Collections.Immutable.1.7.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
133+
<HintPath>..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
134134
</Reference>
135135
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
136136
<HintPath>..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
@@ -148,11 +148,11 @@
148148
<Reference Include="System.Data.OracleClient" />
149149
<Reference Include="System.Drawing" />
150150
<Reference Include="System.IO.Compression.FileSystem" />
151-
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.20.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
152-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.20\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
151+
<Reference Include="System.Linq.Dynamic.Core, Version=1.1.1.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
152+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.1.1\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
153153
</Reference>
154154
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
155-
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
155+
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
156156
</Reference>
157157
<Reference Include="System.Net" />
158158
<Reference Include="System.Numerics" />
@@ -161,7 +161,7 @@
161161
</Reference>
162162
<Reference Include="System.Runtime.Caching" />
163163
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
164-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
164+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
165165
</Reference>
166166
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
167167
<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
@@ -236,11 +236,11 @@
236236
</dependentAssembly>
237237
<dependentAssembly>
238238
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
239-
<bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0" />
239+
<bindingRedirect oldVersion="0.0.0.0-3.1.4.0" newVersion="3.1.4.0" />
240240
</dependentAssembly>
241241
<dependentAssembly>
242242
<assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
243-
<bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0" />
243+
<bindingRedirect oldVersion="0.0.0.0-3.1.4.0" newVersion="3.1.4.0" />
244244
</dependentAssembly>
245245
<dependentAssembly>
246246
<assemblyIdentity name="System.ComponentModel.Annotations" 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.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.1.0" newVersion="3.1.1.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.1.0" newVersion="3.1.1.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

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
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" />
5-
<package id="Abp.Zero" version="5.4.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" 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" />
5+
<package id="Abp.Zero" version="5.9.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="5.9.0" targetFramework="net461" />
77
<package id="AutoMapper" version="9.0.0" targetFramework="net461" />
88
<package id="AutoMapper.Collection" version="6.0.0" targetFramework="net461" />
9-
<package id="Castle.Core" version="4.4.0" targetFramework="net461" />
9+
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
1010
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
1111
<package id="Castle.LoggingFacility" version="5.0.1" targetFramework="net461" />
1212
<package id="Castle.Windsor" version="5.0.1" targetFramework="net461" />
13-
<package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net461" />
13+
<package id="JetBrains.Annotations" version="2020.1.0" 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.1" targetFramework="net461" />
19-
<package id="Microsoft.Extensions.Caching.Memory" version="3.1.1" targetFramework="net461" />
20-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.1" targetFramework="net461" />
21-
<package id="Microsoft.Extensions.Logging.Abstractions" version="3.1.1" targetFramework="net461" />
22-
<package id="Microsoft.Extensions.Options" version="3.1.1" targetFramework="net461" />
23-
<package id="Microsoft.Extensions.Primitives" version="3.1.1" targetFramework="net461" />
18+
<package id="Microsoft.Extensions.Caching.Abstractions" version="3.1.4" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.Caching.Memory" version="3.1.4" targetFramework="net461" />
20+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.4" targetFramework="net461" />
21+
<package id="Microsoft.Extensions.Logging.Abstractions" version="3.1.4" targetFramework="net461" />
22+
<package id="Microsoft.Extensions.Options" version="3.1.4" targetFramework="net461" />
23+
<package id="Microsoft.Extensions.Primitives" version="3.1.4" targetFramework="net461" />
2424
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
2525
<package id="Nito.AsyncEx" version="5.0.0" targetFramework="net461" />
2626
<package id="Nito.AsyncEx.Context" version="5.0.0" targetFramework="net461" />
@@ -31,16 +31,16 @@
3131
<package id="Nito.Cancellation" version="1.0.5" targetFramework="net461" />
3232
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
3333
<package id="Nito.Disposables" version="2.0.1" targetFramework="net461" />
34-
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
35-
<package id="System.Collections.Immutable" version="1.7.0" targetFramework="net461" />
34+
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
35+
<package id="System.Collections.Immutable" version="1.7.1" targetFramework="net461" />
3636
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net461" />
3737
<package id="System.Configuration.ConfigurationManager" version="4.7.0" targetFramework="net461" />
3838
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
39-
<package id="System.Linq.Dynamic.Core" version="1.0.20" targetFramework="net461" />
39+
<package id="System.Linq.Dynamic.Core" version="1.1.1" targetFramework="net461" />
4040
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
41-
<package id="System.Memory" version="4.5.3" targetFramework="net461" />
41+
<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.0" targetFramework="net461" />
43+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" 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" />

0 commit comments

Comments
 (0)