Skip to content

Commit 5e33665

Browse files
alirizaadiyahsialirizaadiyahsi
committed
Resolved #125 - Upgrade to ABP v3.6.1
1 parent 1d91352 commit 5e33665

File tree

22 files changed

+406
-406
lines changed

22 files changed

+406
-406
lines changed

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

Lines changed: 17 additions & 17 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.5.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.5.0\lib\netstandard2.0\Abp.dll</HintPath>
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>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.3.5.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
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>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.3.5.0\lib\net461\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=3.6.1.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.3.6.1\lib\net461\Abp.Zero.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.Common.3.5.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
47+
<Reference Include="Abp.Zero.Common, Version=3.6.1.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.3.6.1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4949
</Reference>
5050
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5151
<HintPath>..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
@@ -65,17 +65,17 @@
6565
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
6767
</Reference>
68-
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
68+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
71+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
7373
</Reference>
7474
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
7575
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
7676
</Reference>
77-
<Reference Include="Microsoft.Extensions.Options, Version=2.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Microsoft.Extensions.Options.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
77+
<Reference Include="Microsoft.Extensions.Options, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.Extensions.Options.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
7979
</Reference>
8080
<Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
8181
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
@@ -136,7 +136,7 @@
136136
<Reference Include="System.Drawing" />
137137
<Reference Include="System.IO.Compression.FileSystem" />
138138
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
139-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.2\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
139+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.6\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
140140
</Reference>
141141
<Reference Include="System.Net" />
142142
<Reference Include="System.Numerics" />
@@ -180,8 +180,8 @@
180180
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
181181
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
182182
</Reference>
183-
<Reference Include="TimeZoneConverter, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL">
184-
<HintPath>..\packages\TimeZoneConverter.2.3.1\lib\net45\TimeZoneConverter.dll</HintPath>
183+
<Reference Include="TimeZoneConverter, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
184+
<HintPath>..\packages\TimeZoneConverter.2.4.1\lib\net45\TimeZoneConverter.dll</HintPath>
185185
</Reference>
186186
</ItemGroup>
187187
<ItemGroup>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.5.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="3.5.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="3.5.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="3.5.0" targetFramework="net461" />
3+
<package id="Abp" version="3.6.1" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="3.6.1" targetFramework="net461" />
5+
<package id="Abp.Zero" version="3.6.1" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="3.6.1" targetFramework="net461" />
77
<package id="AutoMapper" version="6.2.2" targetFramework="net461" />
88
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
99
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
@@ -13,10 +13,10 @@
1313
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
1414
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
1515
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
16-
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.0.1" targetFramework="net461" />
17-
<package id="Microsoft.Extensions.Caching.Memory" version="2.0.1" targetFramework="net461" />
16+
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.0.2" targetFramework="net461" />
17+
<package id="Microsoft.Extensions.Caching.Memory" version="2.0.2" targetFramework="net461" />
1818
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" />
19-
<package id="Microsoft.Extensions.Options" version="2.0.1" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.Options" version="2.0.2" targetFramework="net461" />
2020
<package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
2121
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
2222
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net461" />
@@ -29,7 +29,7 @@
2929
<package id="System.ComponentModel.Annotations" version="4.4.1" targetFramework="net461" />
3030
<package id="System.Configuration.ConfigurationManager" version="4.4.1" targetFramework="net461" />
3131
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
32-
<package id="System.Linq.Dynamic.Core" version="1.0.8.2" targetFramework="net461" />
32+
<package id="System.Linq.Dynamic.Core" version="1.0.8.6" targetFramework="net461" />
3333
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3434
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
3535
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
@@ -40,5 +40,5 @@
4040
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
4141
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
4242
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
43-
<package id="TimeZoneConverter" version="2.3.1" targetFramework="net461" />
43+
<package id="TimeZoneConverter" version="2.4.1" targetFramework="net461" />
4444
</packages>

‎src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.5.0\lib\netstandard2.0\Abp.dll</HintPath>
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>
4040
</Reference>
41-
<Reference Include="Abp.Zero, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.Zero.3.5.0\lib\net461\Abp.Zero.dll</HintPath>
41+
<Reference Include="Abp.Zero, Version=3.6.1.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.Zero.3.6.1\lib\net461\Abp.Zero.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero.Common, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.Common.3.5.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
44+
<Reference Include="Abp.Zero.Common, Version=3.6.1.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.Common.3.6.1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4848
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
@@ -59,17 +59,17 @@
5959
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6060
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
6161
</Reference>
62-
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
62+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
6464
</Reference>
65-
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
65+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
6969
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Microsoft.Extensions.Options, Version=2.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Microsoft.Extensions.Options.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
71+
<Reference Include="Microsoft.Extensions.Options, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Extensions.Options.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
7373
</Reference>
7474
<Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
7575
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
@@ -130,7 +130,7 @@
130130
<Reference Include="System.Drawing" />
131131
<Reference Include="System.IO.Compression.FileSystem" />
132132
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
133-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.2\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
133+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.6\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
134134
</Reference>
135135
<Reference Include="System.Net" />
136136
<Reference Include="System.Numerics" />
@@ -174,8 +174,8 @@
174174
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
175175
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
176176
</Reference>
177-
<Reference Include="TimeZoneConverter, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL">
178-
<HintPath>..\packages\TimeZoneConverter.2.3.1\lib\net45\TimeZoneConverter.dll</HintPath>
177+
<Reference Include="TimeZoneConverter, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
178+
<HintPath>..\packages\TimeZoneConverter.2.4.1\lib\net45\TimeZoneConverter.dll</HintPath>
179179
</Reference>
180180
</ItemGroup>
181181
<ItemGroup>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.5.0" targetFramework="net461" />
4-
<package id="Abp.Zero" version="3.5.0" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="3.5.0" targetFramework="net461" />
3+
<package id="Abp" version="3.6.1" targetFramework="net461" />
4+
<package id="Abp.Zero" version="3.6.1" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="3.6.1" targetFramework="net461" />
66
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
77
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
88
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
@@ -11,10 +11,10 @@
1111
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
1212
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
1313
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
14-
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.0.1" targetFramework="net461" />
15-
<package id="Microsoft.Extensions.Caching.Memory" version="2.0.1" targetFramework="net461" />
14+
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.0.2" targetFramework="net461" />
15+
<package id="Microsoft.Extensions.Caching.Memory" version="2.0.2" targetFramework="net461" />
1616
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" />
17-
<package id="Microsoft.Extensions.Options" version="2.0.1" targetFramework="net461" />
17+
<package id="Microsoft.Extensions.Options" version="2.0.2" targetFramework="net461" />
1818
<package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
1919
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
2020
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net461" />
@@ -27,7 +27,7 @@
2727
<package id="System.ComponentModel.Annotations" version="4.4.1" targetFramework="net461" />
2828
<package id="System.Configuration.ConfigurationManager" version="4.4.1" targetFramework="net461" />
2929
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
30-
<package id="System.Linq.Dynamic.Core" version="1.0.8.2" targetFramework="net461" />
30+
<package id="System.Linq.Dynamic.Core" version="1.0.8.6" targetFramework="net461" />
3131
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3232
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
3333
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
@@ -38,5 +38,5 @@
3838
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
3939
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
4040
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
41-
<package id="TimeZoneConverter" version="2.3.1" targetFramework="net461" />
41+
<package id="TimeZoneConverter" version="2.4.1" targetFramework="net461" />
4242
</packages>

0 commit comments

Comments
 (0)