Skip to content

Commit 46bdb23

Browse files
alirizaadiyahsialirizaadiyahsi
committed
Resolved #144 - Upgrade ABP to v3.8.3
1 parent a68e017 commit 46bdb23

38 files changed

+752
-681
lines changed

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

Lines changed: 22 additions & 22 deletions
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=3.8.1.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.8.1\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.8.3.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.8.3\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
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>
41+
<Reference Include="Abp.AutoMapper, Version=3.8.3.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.3.8.3\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
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>
44+
<Reference Include="Abp.Zero, Version=3.8.3.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.3.8.3\lib\net461\Abp.Zero.dll</HintPath>
4646
</Reference>
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>
47+
<Reference Include="Abp.Zero.Common, Version=3.8.3.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.3.8.3\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4949
</Reference>
5050
<Reference Include="AutoMapper, Version=7.0.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5151
<HintPath>..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll</HintPath>
@@ -62,17 +62,17 @@
6262
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
6363
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
6464
</Reference>
65-
<Reference Include="JetBrains.Annotations, Version=11.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
66-
<HintPath>..\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
65+
<Reference Include="JetBrains.Annotations, Version=2018.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
66+
<HintPath>..\packages\JetBrains.Annotations.2018.2.1\lib\net20\JetBrains.Annotations.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6969
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
7070
</Reference>
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>
71+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.1.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
7373
</Reference>
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>
74+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.1.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
7676
</Reference>
7777
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
7878
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
@@ -116,12 +116,12 @@
116116
<Reference Include="Nito.Collections.Deque, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
117117
<HintPath>..\packages\Nito.Collections.Deque.1.0.4\lib\netstandard2.0\Nito.Collections.Deque.dll</HintPath>
118118
</Reference>
119-
<Reference Include="Nito.Disposables, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
120-
<HintPath>..\packages\Nito.Disposables.1.2.3\lib\netstandard2.0\Nito.Disposables.dll</HintPath>
119+
<Reference Include="Nito.Disposables, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
120+
<HintPath>..\packages\Nito.Disposables.2.0.0\lib\netstandard2.0\Nito.Disposables.dll</HintPath>
121121
</Reference>
122122
<Reference Include="System" />
123-
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
124-
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
123+
<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>
125125
</Reference>
126126
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
127127
<HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
@@ -142,16 +142,16 @@
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=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
146-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.11\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
145+
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.8.18, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
146+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.18\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
147147
</Reference>
148148
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
149149
<HintPath>..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
150150
</Reference>
151151
<Reference Include="System.Net" />
152152
<Reference Include="System.Numerics" />
153-
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
154-
<HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
153+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
154+
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
155155
</Reference>
156156
<Reference Include="System.Runtime.Caching" />
157157
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,20 +236,32 @@
236236
</dependentAssembly>
237237
<dependentAssembly>
238238
<assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
239-
<bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
239+
<bindingRedirect oldVersion="0.0.0.0-2.1.2.0" newVersion="2.1.2.0" />
240240
</dependentAssembly>
241241
<dependentAssembly>
242242
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
243243
<bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
244244
</dependentAssembly>
245245
<dependentAssembly>
246246
<assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
247-
<bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
247+
<bindingRedirect oldVersion="0.0.0.0-2.1.2.0" newVersion="2.1.2.0" />
248248
</dependentAssembly>
249249
<dependentAssembly>
250250
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
251251
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
252252
</dependentAssembly>
253+
<dependentAssembly>
254+
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
255+
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
256+
</dependentAssembly>
257+
<dependentAssembly>
258+
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
259+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
260+
</dependentAssembly>
261+
<dependentAssembly>
262+
<assemblyIdentity name="System.Linq.Dynamic.Core" publicKeyToken="0f07ec44de6ac832" culture="neutral" />
263+
<bindingRedirect oldVersion="0.0.0.0-1.0.8.18" newVersion="1.0.8.18" />
264+
</dependentAssembly>
253265
</assemblyBinding>
254266
</runtime>
255267
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
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" />
3+
<package id="Abp" version="3.8.3" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="3.8.3" targetFramework="net461" />
5+
<package id="Abp.Zero" version="3.8.3" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="3.8.3" targetFramework="net461" />
77
<package id="AutoMapper" version="7.0.1" targetFramework="net461" />
88
<package id="AutoMapper.Collection" version="4.0.0" targetFramework="net461" />
99
<package id="Castle.Core" version="4.3.1" targetFramework="net461" />
1010
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
1111
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
12-
<package id="JetBrains.Annotations" version="11.1.0" targetFramework="net461" />
12+
<package id="JetBrains.Annotations" version="2018.2.1" targetFramework="net461" />
1313
<package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net461" />
1414
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
1616
<package id="Microsoft.Bcl.Build" version="1.0.21" 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" />
17+
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.1.2" targetFramework="net461" />
18+
<package id="Microsoft.Extensions.Caching.Memory" version="2.1.2" targetFramework="net461" />
1919
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net461" />
2020
<package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net461" />
2121
<package id="Microsoft.Extensions.Primitives" version="2.1.1" targetFramework="net461" />
@@ -25,16 +25,16 @@
2525
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />
2626
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net461" />
2727
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
28-
<package id="Nito.Disposables" version="1.2.3" targetFramework="net461" />
29-
<package id="System.Buffers" version="4.4.0" targetFramework="net461" />
28+
<package id="Nito.Disposables" version="2.0.0" targetFramework="net461" />
29+
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
3030
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
3131
<package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
3232
<package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net461" />
3333
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
34-
<package id="System.Linq.Dynamic.Core" version="1.0.8.11" targetFramework="net461" />
34+
<package id="System.Linq.Dynamic.Core" version="1.0.8.18" targetFramework="net461" />
3535
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3636
<package id="System.Memory" version="4.5.1" targetFramework="net461" />
37-
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
37+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
3838
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
3939
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
4040
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />

0 commit comments

Comments
 (0)