Skip to content

Commit 4c72d71

Browse files
alirizaadiyahsialirizaadiyahsi
committed
Fixed #75 - Upgrade to ABP v3.4
1 parent 831fe80 commit 4c72d71

File tree

17 files changed

+203
-142
lines changed

17 files changed

+203
-142
lines changed

‎src/.vs/AbpCompanyName.AbpProjectName/v15/sqlite3/storage.ide

252 KB
Binary file not shown.

‎src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.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.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="AutoMapper, Version=6.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
45-
<HintPath>..\packages\AutoMapper.6.2.1\lib\net45\AutoMapper.dll</HintPath>
44+
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
45+
<HintPath>..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.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>
@@ -118,12 +118,12 @@
118118
<HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
119119
</Reference>
120120
<Reference Include="System.ComponentModel.Annotations, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
121-
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
121+
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
122122
</Reference>
123123
<Reference Include="System.ComponentModel.DataAnnotations" />
124124
<Reference Include="System.Configuration" />
125125
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
126-
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
126+
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.1\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
127127
</Reference>
128128
<Reference Include="System.Core" />
129129
<Reference Include="System.Data.Common">
@@ -133,14 +133,18 @@
133133
<Reference Include="System.Drawing" />
134134
<Reference Include="System.IO.Compression.FileSystem" />
135135
<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.7.12\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
136+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.2\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
137137
</Reference>
138138
<Reference Include="System.Net" />
139139
<Reference Include="System.Numerics" />
140140
<Reference Include="System.Runtime.Caching" />
141141
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
142142
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
143143
</Reference>
144+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
145+
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
146+
<Private>True</Private>
147+
</Reference>
144148
<Reference Include="System.Runtime.Remoting" />
145149
<Reference Include="System.Runtime.Serialization" />
146150
<Reference Include="System.Runtime.Serialization.Formatters">
@@ -173,6 +177,9 @@
173177
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
174178
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
175179
</Reference>
180+
<Reference Include="TimeZoneConverter, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
181+
<HintPath>..\packages\TimeZoneConverter.2.2.1\lib\net45\TimeZoneConverter.dll</HintPath>
182+
</Reference>
176183
</ItemGroup>
177184
<ItemGroup>
178185
<Compile Include="AbpProjectNameApplicationModule.cs" />

‎src/AbpCompanyName.AbpProjectName.Application/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.AutoMapper" version="3.3.0" targetFramework="net461" />
5-
<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="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" />
88
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
@@ -23,17 +23,19 @@
2323
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
2424
<package id="Nito.Disposables" version="1.2.3" targetFramework="net461" />
2525
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
26-
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
27-
<package id="System.Configuration.ConfigurationManager" version="4.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" />
2828
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
29-
<package id="System.Linq.Dynamic.Core" version="1.0.7.12" targetFramework="net461" />
29+
<package id="System.Linq.Dynamic.Core" version="1.0.8.2" targetFramework="net461" />
3030
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3131
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
32+
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
3233
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
3334
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
3435
<package id="System.Security.Claims" version="4.3.0" targetFramework="net461" />
3536
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
3637
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
3738
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
3839
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
40+
<package id="TimeZoneConverter" version="2.2.1" targetFramework="net461" />
3941
</packages>

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
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>
4141
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4242
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
@@ -112,12 +112,12 @@
112112
<HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
113113
</Reference>
114114
<Reference Include="System.ComponentModel.Annotations, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
115-
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
115+
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
116116
</Reference>
117117
<Reference Include="System.ComponentModel.DataAnnotations" />
118118
<Reference Include="System.Configuration" />
119119
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
120-
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
120+
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.1\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
121121
</Reference>
122122
<Reference Include="System.Core" />
123123
<Reference Include="System.Data.Common">
@@ -127,14 +127,18 @@
127127
<Reference Include="System.Drawing" />
128128
<Reference Include="System.IO.Compression.FileSystem" />
129129
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
130-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.12\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
130+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.2\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
131131
</Reference>
132132
<Reference Include="System.Net" />
133133
<Reference Include="System.Numerics" />
134134
<Reference Include="System.Runtime.Caching" />
135135
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
136136
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
137137
</Reference>
138+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
139+
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
140+
<Private>True</Private>
141+
</Reference>
138142
<Reference Include="System.Runtime.Remoting" />
139143
<Reference Include="System.Runtime.Serialization" />
140144
<Reference Include="System.Runtime.Serialization.Formatters">
@@ -167,6 +171,9 @@
167171
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
168172
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
169173
</Reference>
174+
<Reference Include="TimeZoneConverter, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
175+
<HintPath>..\packages\TimeZoneConverter.2.2.1\lib\net45\TimeZoneConverter.dll</HintPath>
176+
</Reference>
170177
</ItemGroup>
171178
<ItemGroup>
172179
<Compile Include="AbpProjectNameConsts.cs" />

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.3.0" targetFramework="net461" />
3+
<package id="Abp" version="3.4.0" targetFramework="net461" />
44
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
55
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
66
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
@@ -21,17 +21,19 @@
2121
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
2222
<package id="Nito.Disposables" version="1.2.3" targetFramework="net461" />
2323
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
24-
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
25-
<package id="System.Configuration.ConfigurationManager" version="4.4.0" targetFramework="net461" />
24+
<package id="System.ComponentModel.Annotations" version="4.4.1" targetFramework="net461" />
25+
<package id="System.Configuration.ConfigurationManager" version="4.4.1" targetFramework="net461" />
2626
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
27-
<package id="System.Linq.Dynamic.Core" version="1.0.7.12" targetFramework="net461" />
27+
<package id="System.Linq.Dynamic.Core" version="1.0.8.2" targetFramework="net461" />
2828
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
2929
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
30+
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
3031
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
3132
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
3233
<package id="System.Security.Claims" version="4.3.0" targetFramework="net461" />
3334
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
3435
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
3536
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
3637
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
38+
<package id="TimeZoneConverter" version="2.2.1" targetFramework="net461" />
3739
</packages>

‎src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.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.EntityFramework, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.EntityFramework.3.3.0\lib\net461\Abp.EntityFramework.dll</HintPath>
41+
<Reference Include="Abp.EntityFramework, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.EntityFramework.3.4.0\lib\net461\Abp.EntityFramework.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.EntityFramework.Common, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.EntityFramework.Common.3.3.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
44+
<Reference Include="Abp.EntityFramework.Common, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.EntityFramework.Common.3.4.0\lib\netstandard2.0\Abp.EntityFramework.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>
@@ -127,12 +127,12 @@
127127
<HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
128128
</Reference>
129129
<Reference Include="System.ComponentModel.Annotations, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
130-
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
130+
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
131131
</Reference>
132132
<Reference Include="System.ComponentModel.DataAnnotations" />
133133
<Reference Include="System.Configuration" />
134134
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
135-
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
135+
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.1\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
136136
</Reference>
137137
<Reference Include="System.Core" />
138138
<Reference Include="System.Data.Common">
@@ -142,14 +142,18 @@
142142
<Reference Include="System.Drawing" />
143143
<Reference Include="System.IO.Compression.FileSystem" />
144144
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
145-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.12\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
145+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.2\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
146146
</Reference>
147147
<Reference Include="System.Net" />
148148
<Reference Include="System.Numerics" />
149149
<Reference Include="System.Runtime.Caching" />
150150
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
151151
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
152152
</Reference>
153+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
154+
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
155+
<Private>True</Private>
156+
</Reference>
153157
<Reference Include="System.Runtime.Remoting" />
154158
<Reference Include="System.Runtime.Serialization" />
155159
<Reference Include="System.Runtime.Serialization.Formatters">
@@ -182,6 +186,9 @@
182186
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
183187
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
184188
</Reference>
189+
<Reference Include="TimeZoneConverter, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
190+
<HintPath>..\packages\TimeZoneConverter.2.2.1\lib\net45\TimeZoneConverter.dll</HintPath>
191+
</Reference>
185192
</ItemGroup>
186193
<ItemGroup>
187194
<Compile Include="EntityFramework\AbpProjectNameDbContext.cs" />

0 commit comments

Comments
 (0)