Skip to content

Commit 3e48549

Browse files
alirizaadiyahsialirizaadiyahsi
committed
Fixed #81 - Upgrade ABP to v3.7.2
1 parent b9124d4 commit 3e48549

File tree

23 files changed

+958
-722
lines changed

23 files changed

+958
-722
lines changed

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

Lines changed: 43 additions & 23 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=3.6.1.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.6.1\lib\netstandard2.0\Abp.dll</HintPath>
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>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=3.6.1.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.3.6.1\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
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>
4343
</Reference>
4444
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
4545
<HintPath>..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
@@ -56,20 +56,20 @@
5656
<Reference Include="JetBrains.Annotations, Version=11.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
5757
<HintPath>..\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
5858
</Reference>
59-
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
60-
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
59+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
6161
</Reference>
62-
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
62+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
6464
</Reference>
65-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
65+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
6767
</Reference>
68-
<Reference Include="Microsoft.Extensions.Options, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Microsoft.Extensions.Options.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
68+
<Reference Include="Microsoft.Extensions.Options, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Microsoft.Extensions.Options.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
71+
<Reference Include="Microsoft.Extensions.Primitives, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.1.0\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>
@@ -114,32 +114,42 @@
114114
<HintPath>..\packages\Nito.Disposables.1.2.3\lib\netstandard2.0\Nito.Disposables.dll</HintPath>
115115
</Reference>
116116
<Reference Include="System" />
117-
<Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
118-
<HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
117+
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
118+
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
119119
</Reference>
120-
<Reference Include="System.ComponentModel.Annotations, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
121-
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
120+
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
121+
<HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
122+
</Reference>
123+
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
124+
<HintPath>..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
122125
</Reference>
123126
<Reference Include="System.ComponentModel.DataAnnotations" />
124127
<Reference Include="System.Configuration" />
125-
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
126-
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.1\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
128+
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
129+
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.5.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
127130
</Reference>
128131
<Reference Include="System.Core" />
129132
<Reference Include="System.Data.Common">
130133
<HintPath>..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
131134
<Private>True</Private>
132135
</Reference>
136+
<Reference Include="System.Data.OracleClient" />
133137
<Reference Include="System.Drawing" />
134138
<Reference Include="System.IO.Compression.FileSystem" />
135139
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
136-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.6\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
140+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.9\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
141+
</Reference>
142+
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
143+
<HintPath>..\packages\System.Memory.4.5.0\lib\netstandard2.0\System.Memory.dll</HintPath>
137144
</Reference>
138145
<Reference Include="System.Net" />
139146
<Reference Include="System.Numerics" />
147+
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
148+
<HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
149+
</Reference>
140150
<Reference Include="System.Runtime.Caching" />
141-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
142-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
151+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
152+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
143153
</Reference>
144154
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
145155
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
@@ -155,10 +165,20 @@
155165
<HintPath>..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll</HintPath>
156166
<Private>True</Private>
157167
</Reference>
168+
<Reference Include="System.Security.AccessControl, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
169+
<HintPath>..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll</HintPath>
170+
</Reference>
158171
<Reference Include="System.Security.Claims">
159172
<HintPath>..\packages\System.Security.Claims.4.3.0\lib\net46\System.Security.Claims.dll</HintPath>
160173
<Private>True</Private>
161174
</Reference>
175+
<Reference Include="System.Security.Permissions, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
176+
<HintPath>..\packages\System.Security.Permissions.4.5.0\lib\net461\System.Security.Permissions.dll</HintPath>
177+
</Reference>
178+
<Reference Include="System.Security.Principal.Windows, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
179+
<HintPath>..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
180+
</Reference>
181+
<Reference Include="System.ServiceProcess" />
162182
<Reference Include="System.Transactions" />
163183
<Reference Include="System.Web" />
164184
<Reference Include="System.Xml.Linq" />

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-1.0.34.0" newVersion="1.0.34.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
@@ -22,6 +22,10 @@
2222
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
2323
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
2424
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
28+
</dependentAssembly>
2529
</assemblyBinding>
2630
</runtime>
2731
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

Lines changed: 18 additions & 12 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="3.6.1" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="3.6.1" targetFramework="net461" />
3+
<package id="Abp" version="3.7.2" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="3.7.2" targetFramework="net461" />
55
<package id="AutoMapper" version="6.2.2" targetFramework="net461" />
66
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
77
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
@@ -10,29 +10,35 @@
1010
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
1212
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
13-
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.0.2" targetFramework="net461" />
14-
<package id="Microsoft.Extensions.Caching.Memory" version="2.0.2" targetFramework="net461" />
15-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" />
16-
<package id="Microsoft.Extensions.Options" version="2.0.2" targetFramework="net461" />
17-
<package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
13+
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.1.0" targetFramework="net461" />
14+
<package id="Microsoft.Extensions.Caching.Memory" version="2.1.0" targetFramework="net461" />
15+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.0" targetFramework="net461" />
16+
<package id="Microsoft.Extensions.Options" version="2.1.0" targetFramework="net461" />
17+
<package id="Microsoft.Extensions.Primitives" version="2.1.0" targetFramework="net461" />
1818
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
1919
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
2020
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
2121
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />
2222
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net461" />
2323
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
2424
<package id="Nito.Disposables" version="1.2.3" targetFramework="net461" />
25-
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
26-
<package id="System.ComponentModel.Annotations" version="4.4.1" targetFramework="net461" />
27-
<package id="System.Configuration.ConfigurationManager" version="4.4.1" targetFramework="net461" />
25+
<package id="System.Buffers" version="4.4.0" targetFramework="net461" />
26+
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
27+
<package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
28+
<package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net461" />
2829
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
29-
<package id="System.Linq.Dynamic.Core" version="1.0.8.6" targetFramework="net461" />
30+
<package id="System.Linq.Dynamic.Core" version="1.0.8.9" targetFramework="net461" />
3031
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
31-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
32+
<package id="System.Memory" version="4.5.0" targetFramework="net461" />
33+
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
34+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net461" />
3235
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
3336
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
3437
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
38+
<package id="System.Security.AccessControl" version="4.5.0" targetFramework="net461" />
3539
<package id="System.Security.Claims" version="4.3.0" targetFramework="net461" />
40+
<package id="System.Security.Permissions" version="4.5.0" targetFramework="net461" />
41+
<package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net461" />
3642
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
3743
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
3844
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />

0 commit comments

Comments
 (0)