Skip to content

Commit debbb14

Browse files
alirizaadiyahsialirizaadiyahsi
committed
Fixed #117 - Upgrade to ABP v3.4 and added migration
1 parent 41a139f commit debbb14

File tree

21 files changed

+514
-260
lines changed

21 files changed

+514
-260
lines changed

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

Lines changed: 20 additions & 13 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.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.3.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.4.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.3.3.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.3.4.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.3.3.0\lib\net461\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.3.4.0\lib\net461\Abp.Zero.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.Common.3.3.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
47+
<Reference Include="Abp.Zero.Common, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.3.4.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4949
</Reference>
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>
50+
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51+
<HintPath>..\packages\AutoMapper.6.2.2\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>
@@ -128,12 +128,12 @@
128128
<HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
129129
</Reference>
130130
<Reference Include="System.ComponentModel.Annotations, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
131-
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
131+
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
132132
</Reference>
133133
<Reference Include="System.ComponentModel.DataAnnotations" />
134134
<Reference Include="System.Configuration" />
135135
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
136-
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
136+
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.1\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
137137
</Reference>
138138
<Reference Include="System.Core" />
139139
<Reference Include="System.Data.Common">
@@ -143,14 +143,18 @@
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.12\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
146+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.2\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
147147
</Reference>
148148
<Reference Include="System.Net" />
149149
<Reference Include="System.Numerics" />
150150
<Reference Include="System.Runtime.Caching" />
151151
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
152152
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
153153
</Reference>
154+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
155+
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
156+
<Private>True</Private>
157+
</Reference>
154158
<Reference Include="System.Runtime.Remoting" />
155159
<Reference Include="System.Runtime.Serialization" />
156160
<Reference Include="System.Runtime.Serialization.Formatters">
@@ -183,6 +187,9 @@
183187
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
184188
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
185189
</Reference>
190+
<Reference Include="TimeZoneConverter, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
191+
<HintPath>..\packages\TimeZoneConverter.2.2.1\lib\net45\TimeZoneConverter.dll</HintPath>
192+
</Reference>
186193
</ItemGroup>
187194
<ItemGroup>
188195
<Compile Include="AbpProjectNameApplicationModule.cs" />

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.3.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="3.3.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="3.3.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="3.3.0" targetFramework="net461" />
7-
<package id="AutoMapper" version="6.2.1" targetFramework="net461" />
3+
<package id="Abp" version="3.4.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="3.4.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="3.4.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="3.4.0" targetFramework="net461" />
7+
<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" />
1010
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
@@ -26,17 +26,19 @@
2626
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
2727
<package id="Nito.Disposables" version="1.2.3" targetFramework="net461" />
2828
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
29-
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
30-
<package id="System.Configuration.ConfigurationManager" version="4.4.0" targetFramework="net461" />
29+
<package id="System.ComponentModel.Annotations" version="4.4.1" targetFramework="net461" />
30+
<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.7.12" targetFramework="net461" />
32+
<package id="System.Linq.Dynamic.Core" version="1.0.8.2" 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" />
35+
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
3536
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
3637
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
3738
<package id="System.Security.Claims" version="4.3.0" targetFramework="net461" />
3839
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
3940
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
4041
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
4142
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
43+
<package id="TimeZoneConverter" version="2.2.1" targetFramework="net461" />
4244
</packages>

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

Lines changed: 16 additions & 9 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.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.3.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.4.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.Zero, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.Zero.3.3.0\lib\net461\Abp.Zero.dll</HintPath>
41+
<Reference Include="Abp.Zero, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.Zero.3.4.0\lib\net461\Abp.Zero.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero.Common, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.Common.3.3.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
44+
<Reference Include="Abp.Zero.Common, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.Common.3.4.0\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>
@@ -122,12 +122,12 @@
122122
<HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
123123
</Reference>
124124
<Reference Include="System.ComponentModel.Annotations, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
125-
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
125+
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
126126
</Reference>
127127
<Reference Include="System.ComponentModel.DataAnnotations" />
128128
<Reference Include="System.Configuration" />
129129
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
130-
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
130+
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.1\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
131131
</Reference>
132132
<Reference Include="System.Core" />
133133
<Reference Include="System.Data.Common">
@@ -137,14 +137,18 @@
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.12\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
140+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.2\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
141141
</Reference>
142142
<Reference Include="System.Net" />
143143
<Reference Include="System.Numerics" />
144144
<Reference Include="System.Runtime.Caching" />
145145
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
146146
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
147147
</Reference>
148+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
149+
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
150+
<Private>True</Private>
151+
</Reference>
148152
<Reference Include="System.Runtime.Remoting" />
149153
<Reference Include="System.Runtime.Serialization" />
150154
<Reference Include="System.Runtime.Serialization.Formatters">
@@ -177,6 +181,9 @@
177181
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
178182
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
179183
</Reference>
184+
<Reference Include="TimeZoneConverter, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
185+
<HintPath>..\packages\TimeZoneConverter.2.2.1\lib\net45\TimeZoneConverter.dll</HintPath>
186+
</Reference>
180187
</ItemGroup>
181188
<ItemGroup>
182189
<Compile Include="AbpProjectNameConsts.cs" />

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

Lines changed: 8 additions & 6 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.3.0" targetFramework="net461" />
4-
<package id="Abp.Zero" version="3.3.0" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="3.3.0" targetFramework="net461" />
3+
<package id="Abp" version="3.4.0" targetFramework="net461" />
4+
<package id="Abp.Zero" version="3.4.0" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="3.4.0" 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" />
@@ -24,17 +24,19 @@
2424
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
2525
<package id="Nito.Disposables" version="1.2.3" targetFramework="net461" />
2626
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
27-
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
28-
<package id="System.Configuration.ConfigurationManager" version="4.4.0" targetFramework="net461" />
27+
<package id="System.ComponentModel.Annotations" version="4.4.1" targetFramework="net461" />
28+
<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.7.12" targetFramework="net461" />
30+
<package id="System.Linq.Dynamic.Core" version="1.0.8.2" 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" />
33+
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
3334
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
3435
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
3536
<package id="System.Security.Claims" version="4.3.0" targetFramework="net461" />
3637
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
3738
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
3839
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
3940
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
41+
<package id="TimeZoneConverter" version="2.2.1" targetFramework="net461" />
4042
</packages>

0 commit comments

Comments
 (0)