Skip to content

Commit 456f614

Browse files
alirizaadiyahsialirizaadiyahsi
committed
Upgrade ABP to v4.1 Fixed #147
1 parent 98d357c commit 456f614

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+586
-516
lines changed

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

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -35,53 +35,53 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.9.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.4.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.3.9.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.4.1.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.3.9.0\lib\net461\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.4.1.0\lib\net461\Abp.Zero.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.Common.3.9.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
47+
<Reference Include="Abp.Zero.Common, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.4.1.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4949
</Reference>
50-
<Reference Include="AutoMapper, Version=7.0.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51-
<HintPath>..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll</HintPath>
50+
<Reference Include="AutoMapper, Version=8.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51+
<HintPath>..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll</HintPath>
5252
</Reference>
53-
<Reference Include="AutoMapper.Collection, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e57c3f0a3d6646db, processorArchitecture=MSIL">
54-
<HintPath>..\packages\AutoMapper.Collection.4.0.0\lib\net45\AutoMapper.Collection.dll</HintPath>
53+
<Reference Include="AutoMapper.Collection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=e57c3f0a3d6646db, processorArchitecture=MSIL">
54+
<HintPath>..\packages\AutoMapper.Collection.5.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">
5757
<HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Castle.Facilities.Logging, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
60-
<HintPath>..\packages\Castle.LoggingFacility.4.1.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
60+
<HintPath>..\packages\Castle.LoggingFacility.4.1.1\lib\net45\Castle.Facilities.Logging.dll</HintPath>
6161
</Reference>
6262
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
63+
<HintPath>..\packages\Castle.Windsor.4.1.1\lib\net45\Castle.Windsor.dll</HintPath>
6464
</Reference>
6565
<Reference Include="JetBrains.Annotations, Version=2018.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
6666
<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.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>
71+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
7373
</Reference>
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>
74+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
7676
</Reference>
77-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
77+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
7979
</Reference>
80-
<Reference Include="Microsoft.Extensions.Options, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
81-
<HintPath>..\packages\Microsoft.Extensions.Options.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
80+
<Reference Include="Microsoft.Extensions.Options, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Microsoft.Extensions.Options.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
8282
</Reference>
83-
<Reference Include="Microsoft.Extensions.Primitives, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
84-
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
83+
<Reference Include="Microsoft.Extensions.Primitives, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
84+
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
8585
</Reference>
8686
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8787
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -92,8 +92,8 @@
9292
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
9393
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
9494
</Reference>
95-
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
96-
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
95+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
96+
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
9797
</Reference>
9898
<Reference Include="Nito.AsyncEx, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
9999
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.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.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>
145+
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.9.1, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
146+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.9.1\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>
@@ -206,8 +206,8 @@
206206
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
207207
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
208208
</Reference>
209-
<Reference Include="TimeZoneConverter, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
210-
<HintPath>..\packages\TimeZoneConverter.2.4.1\lib\net45\TimeZoneConverter.dll</HintPath>
209+
<Reference Include="TimeZoneConverter, Version=2.5.1.0, Culture=neutral, processorArchitecture=MSIL">
210+
<HintPath>..\packages\TimeZoneConverter.2.5.1\lib\net45\TimeZoneConverter.dll</HintPath>
211211
</Reference>
212212
</ItemGroup>
213213
<ItemGroup>

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.9.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="3.9.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="3.9.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="3.9.0" targetFramework="net461" />
7-
<package id="AutoMapper" version="7.0.1" targetFramework="net461" />
8-
<package id="AutoMapper.Collection" version="4.0.0" targetFramework="net461" />
3+
<package id="Abp" version="4.1.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="4.1.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="4.1.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="4.1.0" targetFramework="net461" />
7+
<package id="AutoMapper" version="8.0.0" targetFramework="net461" />
8+
<package id="AutoMapper.Collection" version="5.0.0" targetFramework="net461" />
99
<package id="Castle.Core" version="4.3.1" targetFramework="net461" />
10-
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
11-
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
10+
<package id="Castle.LoggingFacility" version="4.1.1" targetFramework="net461" />
11+
<package id="Castle.Windsor" version="4.1.1" targetFramework="net461" />
1212
<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.2" targetFramework="net461" />
18-
<package id="Microsoft.Extensions.Caching.Memory" version="2.1.2" targetFramework="net461" />
19-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net461" />
20-
<package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net461" />
21-
<package id="Microsoft.Extensions.Primitives" version="2.1.1" targetFramework="net461" />
22-
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
17+
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.2.0" targetFramework="net461" />
18+
<package id="Microsoft.Extensions.Caching.Memory" version="2.2.0" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
20+
<package id="Microsoft.Extensions.Options" version="2.2.0" targetFramework="net461" />
21+
<package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net461" />
22+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
2323
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net461" />
2424
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
2525
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />
@@ -31,7 +31,7 @@
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.18" targetFramework="net461" />
34+
<package id="System.Linq.Dynamic.Core" version="1.0.9.1" 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" />
3737
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
@@ -48,5 +48,5 @@
4848
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
4949
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
5050
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
51-
<package id="TimeZoneConverter" version="2.4.1" targetFramework="net461" />
51+
<package id="TimeZoneConverter" version="2.5.1" targetFramework="net461" />
5252
</packages>

0 commit comments

Comments
 (0)