Skip to content

Commit 9ec2583

Browse files
alirizaadiyahsialirizaadiyahsi
committed
Resolved #109 - Upgrade to latest ABP and other packages
1 parent e7c9b19 commit 9ec2583

File tree

627 files changed

+112044
-67911
lines changed

Some content is hidden

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

627 files changed

+112044
-67911
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,20 +35,20 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=3.1.1.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.1.1\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.2.3\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=3.1.1.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.3.1.1\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.3.2.3\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=3.1.1.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.3.1.1\lib\net461\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.3.2.3\lib\net461\Abp.Zero.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=3.1.1.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.Common.3.1.1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
47+
<Reference Include="Abp.Zero.Common, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.3.2.3\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4949
</Reference>
50-
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51-
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
50+
<Reference Include="AutoMapper, Version=6.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51+
<HintPath>..\packages\AutoMapper.6.2.1\lib\net45\AutoMapper.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5454
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
@@ -59,8 +59,8 @@
5959
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
6060
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
6161
</Reference>
62-
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
63-
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
62+
<Reference Include="JetBrains.Annotations, Version=11.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
63+
<HintPath>..\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
6464
</Reference>
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>
@@ -117,11 +117,11 @@
117117
<Reference Include="Nito.AsyncEx.Tasks, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
118118
<HintPath>..\packages\Nito.AsyncEx.Tasks.1.1.0\lib\net46\Nito.AsyncEx.Tasks.dll</HintPath>
119119
</Reference>
120-
<Reference Include="Nito.Collections.Deque, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
121-
<HintPath>..\packages\Nito.Collections.Deque.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Collections.Deque.dll</HintPath>
120+
<Reference Include="Nito.Collections.Deque, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
121+
<HintPath>..\packages\Nito.Collections.Deque.1.0.4\lib\netstandard2.0\Nito.Collections.Deque.dll</HintPath>
122122
</Reference>
123-
<Reference Include="Nito.Disposables, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
124-
<HintPath>..\packages\Nito.Disposables.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Disposables.dll</HintPath>
123+
<Reference Include="Nito.Disposables, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
124+
<HintPath>..\packages\Nito.Disposables.1.2.3\lib\netstandard2.0\Nito.Disposables.dll</HintPath>
125125
</Reference>
126126
<Reference Include="System" />
127127
<Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -143,7 +143,7 @@
143143
<Reference Include="System.Drawing" />
144144
<Reference Include="System.IO.Compression.FileSystem" />
145145
<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.7.9\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
146+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.12\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
147147
</Reference>
148148
<Reference Include="System.Net" />
149149
<Reference Include="System.Numerics" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
</dependentAssembly>
229229
<dependentAssembly>
230230
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
231-
<bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
231+
<bindingRedirect oldVersion="0.0.0.0-6.2.1.0" newVersion="6.2.1.0" />
232232
</dependentAssembly>
233233
<dependentAssembly>
234234
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.1.1" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="3.1.1" targetFramework="net461" />
5-
<package id="Abp.Zero" version="3.1.1" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="3.1.1" targetFramework="net461" />
7-
<package id="AutoMapper" version="6.1.1" targetFramework="net461" />
3+
<package id="Abp" version="3.2.3" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="3.2.3" targetFramework="net461" />
5+
<package id="Abp.Zero" version="3.2.3" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="3.2.3" targetFramework="net461" />
7+
<package id="AutoMapper" version="6.2.1" targetFramework="net461" />
88
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
99
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
1010
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
11-
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net461" />
11+
<package id="JetBrains.Annotations" version="11.1.0" targetFramework="net461" />
1212
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
1313
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1414
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
@@ -23,13 +23,13 @@
2323
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
2424
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />
2525
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net461" />
26-
<package id="Nito.Collections.Deque" version="1.0.0" targetFramework="net461" />
27-
<package id="Nito.Disposables" version="1.0.0" targetFramework="net461" />
26+
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
27+
<package id="Nito.Disposables" version="1.2.3" targetFramework="net461" />
2828
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
2929
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
3030
<package id="System.Configuration.ConfigurationManager" version="4.4.0" targetFramework="net461" />
3131
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
32-
<package id="System.Linq.Dynamic.Core" version="1.0.7.9" targetFramework="net461" />
32+
<package id="System.Linq.Dynamic.Core" version="1.0.7.12" 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.Serialization.Formatters" version="4.3.0" targetFramework="net461" />

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

Lines changed: 13 additions & 13 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.1.1.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.1.1\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.2.3\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.Zero, Version=3.1.1.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.Zero.3.1.1\lib\net461\Abp.Zero.dll</HintPath>
41+
<Reference Include="Abp.Zero, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.Zero.3.2.3\lib\net461\Abp.Zero.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero.Common, Version=3.1.1.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.Common.3.1.1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
44+
<Reference Include="Abp.Zero.Common, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.Common.3.2.3\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>
@@ -53,8 +53,8 @@
5353
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5454
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
5555
</Reference>
56-
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
57-
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
56+
<Reference Include="JetBrains.Annotations, Version=11.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
57+
<HintPath>..\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
5858
</Reference>
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>
@@ -111,11 +111,11 @@
111111
<Reference Include="Nito.AsyncEx.Tasks, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
112112
<HintPath>..\packages\Nito.AsyncEx.Tasks.1.1.0\lib\net46\Nito.AsyncEx.Tasks.dll</HintPath>
113113
</Reference>
114-
<Reference Include="Nito.Collections.Deque, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
115-
<HintPath>..\packages\Nito.Collections.Deque.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Collections.Deque.dll</HintPath>
114+
<Reference Include="Nito.Collections.Deque, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
115+
<HintPath>..\packages\Nito.Collections.Deque.1.0.4\lib\netstandard2.0\Nito.Collections.Deque.dll</HintPath>
116116
</Reference>
117-
<Reference Include="Nito.Disposables, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
118-
<HintPath>..\packages\Nito.Disposables.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Disposables.dll</HintPath>
117+
<Reference Include="Nito.Disposables, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
118+
<HintPath>..\packages\Nito.Disposables.1.2.3\lib\netstandard2.0\Nito.Disposables.dll</HintPath>
119119
</Reference>
120120
<Reference Include="System" />
121121
<Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -137,7 +137,7 @@
137137
<Reference Include="System.Drawing" />
138138
<Reference Include="System.IO.Compression.FileSystem" />
139139
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
140-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.9\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
140+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.12\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
141141
</Reference>
142142
<Reference Include="System.Net" />
143143
<Reference Include="System.Numerics" />

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.1.1" targetFramework="net461" />
4-
<package id="Abp.Zero" version="3.1.1" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="3.1.1" targetFramework="net461" />
3+
<package id="Abp" version="3.2.3" targetFramework="net461" />
4+
<package id="Abp.Zero" version="3.2.3" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="3.2.3" 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" />
9-
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net461" />
9+
<package id="JetBrains.Annotations" version="11.1.0" targetFramework="net461" />
1010
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
1111
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1212
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
@@ -21,13 +21,13 @@
2121
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
2222
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />
2323
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net461" />
24-
<package id="Nito.Collections.Deque" version="1.0.0" targetFramework="net461" />
25-
<package id="Nito.Disposables" version="1.0.0" targetFramework="net461" />
24+
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
25+
<package id="Nito.Disposables" version="1.2.3" targetFramework="net461" />
2626
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
2727
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
2828
<package id="System.Configuration.ConfigurationManager" version="4.4.0" targetFramework="net461" />
2929
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
30-
<package id="System.Linq.Dynamic.Core" version="1.0.7.9" targetFramework="net461" />
30+
<package id="System.Linq.Dynamic.Core" version="1.0.7.12" 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.Serialization.Formatters" version="4.3.0" targetFramework="net461" />

0 commit comments

Comments
 (0)