Skip to content

Commit 1bf701c

Browse files
ismcagdasismcagdas
authored
Merge pull request #189 from aspnetboilerplate/pr/6073
Update to ABP 6.3
2 parents 52c73df + 36906f5 commit 1bf701c

File tree

22 files changed

+569
-341
lines changed

22 files changed

+569
-341
lines changed

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Abp, Version=6.2.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.6.2.0\lib\netstandard2.0\Abp.dll</HintPath>
39+
<Reference Include="Abp, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.6.3.0\lib\netstandard2.0\Abp.dll</HintPath>
4141
</Reference>
42-
<Reference Include="Abp.AutoMapper, Version=6.2.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.AutoMapper.6.2.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
42+
<Reference Include="Abp.AutoMapper, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.AutoMapper.6.3.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Abp.Zero, Version=6.2.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Abp.Zero.6.2.0\lib\net461\Abp.Zero.dll</HintPath>
45+
<Reference Include="Abp.Zero, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.Zero.6.3.0\lib\net461\Abp.Zero.dll</HintPath>
4747
</Reference>
48-
<Reference Include="Abp.Zero.Common, Version=6.2.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Abp.Zero.Common.6.2.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
48+
<Reference Include="Abp.Zero.Common, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Zero.Common.6.3.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
5050
</Reference>
5151
<Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5252
<HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
5353
</Reference>
5454
<Reference Include="AutoMapper.Collection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=e57c3f0a3d6646db, processorArchitecture=MSIL">
55-
<HintPath>..\packages\AutoMapper.Collection.7.0.0\lib\net461\AutoMapper.Collection.dll</HintPath>
55+
<HintPath>..\packages\AutoMapper.Collection.7.0.1\lib\net461\AutoMapper.Collection.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5858
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
@@ -61,16 +61,16 @@
6161
<HintPath>..\packages\Castle.Core.AsyncInterceptor.2.0.21-alpha\lib\net45\Castle.Core.AsyncInterceptor.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Castle.Facilities.Logging, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Castle.LoggingFacility.5.1.0-beta001\lib\net45\Castle.Facilities.Logging.dll</HintPath>
64+
<HintPath>..\packages\Castle.LoggingFacility.5.1.1\lib\net45\Castle.Facilities.Logging.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Castle.Windsor.5.1.0-beta001\lib\net45\Castle.Windsor.dll</HintPath>
67+
<HintPath>..\packages\Castle.Windsor.5.1.1\lib\net45\Castle.Windsor.dll</HintPath>
6868
</Reference>
6969
<Reference Include="ConfigureAwait, Version=3.3.1.0, Culture=neutral, PublicKeyToken=233850a516558a98, processorArchitecture=MSIL">
7070
<HintPath>..\packages\ConfigureAwait.Fody.3.3.1\lib\net452\ConfigureAwait.dll</HintPath>
7171
</Reference>
72-
<Reference Include="JetBrains.Annotations, Version=2020.2.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
73-
<HintPath>..\packages\JetBrains.Annotations.2020.2.0-eap\lib\net20\JetBrains.Annotations.dll</HintPath>
72+
<Reference Include="JetBrains.Annotations, Version=2020.3.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
73+
<HintPath>..\packages\JetBrains.Annotations.2020.3.0\lib\net20\JetBrains.Annotations.dll</HintPath>
7474
</Reference>
7575
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7676
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.3\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
@@ -153,8 +153,8 @@
153153
<Reference Include="System.Data.OracleClient" />
154154
<Reference Include="System.Drawing" />
155155
<Reference Include="System.IO.Compression.FileSystem" />
156-
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.5.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
157-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.5\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
156+
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.8.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
157+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.8\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
158158
</Reference>
159159
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
160160
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
@@ -218,8 +218,8 @@
218218
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
219219
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
220220
</Reference>
221-
<Reference Include="TimeZoneConverter, Version=3.3.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
222-
<HintPath>..\packages\TimeZoneConverter.3.3.0\lib\net461\TimeZoneConverter.dll</HintPath>
221+
<Reference Include="TimeZoneConverter, Version=3.4.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
222+
<HintPath>..\packages\TimeZoneConverter.3.4.0\lib\net461\TimeZoneConverter.dll</HintPath>
223223
</Reference>
224224
<Reference Include="WindowsBase" />
225225
</ItemGroup>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="6.2.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="6.2.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="6.2.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="6.2.0" targetFramework="net461" />
3+
<package id="Abp" version="6.3.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="6.3.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="6.3.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="6.3.0" targetFramework="net461" />
77
<package id="AutoMapper" version="10.1.1" targetFramework="net461" />
8-
<package id="AutoMapper.Collection" version="7.0.0" targetFramework="net461" />
8+
<package id="AutoMapper.Collection" version="7.0.1" targetFramework="net461" />
99
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
1010
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
11-
<package id="Castle.LoggingFacility" version="5.1.0-beta001" targetFramework="net461" />
12-
<package id="Castle.Windsor" version="5.1.0-beta001" targetFramework="net461" />
11+
<package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
12+
<package id="Castle.Windsor" version="5.1.1" targetFramework="net461" />
1313
<package id="ConfigureAwait.Fody" version="3.3.1" targetFramework="net461" />
1414
<package id="Fody" version="6.0.2" targetFramework="net461" developmentDependency="true" />
15-
<package id="JetBrains.Annotations" version="2020.2.0-eap" targetFramework="net461" />
15+
<package id="JetBrains.Annotations" version="2020.3.0" targetFramework="net461" />
1616
<package id="Microsoft.AspNet.Identity.Core" version="2.2.3" targetFramework="net461" />
1717
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
1818
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
@@ -38,7 +38,7 @@
3838
<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net461" />
3939
<package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net461" />
4040
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
41-
<package id="System.Linq.Dynamic.Core" version="1.2.5" targetFramework="net461" />
41+
<package id="System.Linq.Dynamic.Core" version="1.2.8" targetFramework="net461" />
4242
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
4343
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
4444
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
@@ -55,5 +55,5 @@
5555
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
5656
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
5757
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
58-
<package id="TimeZoneConverter" version="3.3.0" targetFramework="net461" />
58+
<package id="TimeZoneConverter" version="3.4.0" targetFramework="net461" />
5959
</packages>

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Abp, Version=6.2.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.6.2.0\lib\netstandard2.0\Abp.dll</HintPath>
39+
<Reference Include="Abp, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.6.3.0\lib\netstandard2.0\Abp.dll</HintPath>
4141
</Reference>
42-
<Reference Include="Abp.Zero, Version=6.2.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.Zero.6.2.0\lib\net461\Abp.Zero.dll</HintPath>
42+
<Reference Include="Abp.Zero, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.Zero.6.3.0\lib\net461\Abp.Zero.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Abp.Zero.Common, Version=6.2.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Abp.Zero.Common.6.2.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
45+
<Reference Include="Abp.Zero.Common, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.Zero.Common.6.3.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4949
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
@@ -52,16 +52,16 @@
5252
<HintPath>..\packages\Castle.Core.AsyncInterceptor.2.0.21-alpha\lib\net45\Castle.Core.AsyncInterceptor.dll</HintPath>
5353
</Reference>
5454
<Reference Include="Castle.Facilities.Logging, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Castle.LoggingFacility.5.1.0-beta001\lib\net45\Castle.Facilities.Logging.dll</HintPath>
55+
<HintPath>..\packages\Castle.LoggingFacility.5.1.1\lib\net45\Castle.Facilities.Logging.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
58-
<HintPath>..\packages\Castle.Windsor.5.1.0-beta001\lib\net45\Castle.Windsor.dll</HintPath>
58+
<HintPath>..\packages\Castle.Windsor.5.1.1\lib\net45\Castle.Windsor.dll</HintPath>
5959
</Reference>
6060
<Reference Include="ConfigureAwait, Version=3.3.1.0, Culture=neutral, PublicKeyToken=233850a516558a98, processorArchitecture=MSIL">
6161
<HintPath>..\packages\ConfigureAwait.Fody.3.3.1\lib\net452\ConfigureAwait.dll</HintPath>
6262
</Reference>
63-
<Reference Include="JetBrains.Annotations, Version=2020.2.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
64-
<HintPath>..\packages\JetBrains.Annotations.2020.2.0-eap\lib\net20\JetBrains.Annotations.dll</HintPath>
63+
<Reference Include="JetBrains.Annotations, Version=2020.3.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
64+
<HintPath>..\packages\JetBrains.Annotations.2020.3.0\lib\net20\JetBrains.Annotations.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6767
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.3\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
@@ -143,8 +143,8 @@
143143
<Reference Include="System.Data.OracleClient" />
144144
<Reference Include="System.Drawing" />
145145
<Reference Include="System.IO.Compression.FileSystem" />
146-
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.5.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
147-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.5\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
146+
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.8.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
147+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.8\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
148148
</Reference>
149149
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
150150
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
@@ -205,8 +205,8 @@
205205
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
206206
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
207207
</Reference>
208-
<Reference Include="TimeZoneConverter, Version=3.3.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
209-
<HintPath>..\packages\TimeZoneConverter.3.3.0\lib\net461\TimeZoneConverter.dll</HintPath>
208+
<Reference Include="TimeZoneConverter, Version=3.4.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
209+
<HintPath>..\packages\TimeZoneConverter.3.4.0\lib\net461\TimeZoneConverter.dll</HintPath>
210210
</Reference>
211211
<Reference Include="WindowsBase" />
212212
</ItemGroup>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="6.2.0" targetFramework="net461" />
4-
<package id="Abp.Zero" version="6.2.0" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="6.2.0" targetFramework="net461" />
3+
<package id="Abp" version="6.3.0" targetFramework="net461" />
4+
<package id="Abp.Zero" version="6.3.0" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="6.3.0" targetFramework="net461" />
66
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
77
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
8-
<package id="Castle.LoggingFacility" version="5.1.0-beta001" targetFramework="net461" />
9-
<package id="Castle.Windsor" version="5.1.0-beta001" targetFramework="net461" />
8+
<package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
9+
<package id="Castle.Windsor" version="5.1.1" targetFramework="net461" />
1010
<package id="ConfigureAwait.Fody" version="3.3.1" targetFramework="net461" />
1111
<package id="Fody" version="6.0.2" targetFramework="net461" developmentDependency="true" />
12-
<package id="JetBrains.Annotations" version="2020.2.0-eap" targetFramework="net461" />
12+
<package id="JetBrains.Annotations" version="2020.3.0" targetFramework="net461" />
1313
<package id="Microsoft.AspNet.Identity.Core" version="2.2.3" 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" />
@@ -35,7 +35,7 @@
3535
<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net461" />
3636
<package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net461" />
3737
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
38-
<package id="System.Linq.Dynamic.Core" version="1.2.5" targetFramework="net461" />
38+
<package id="System.Linq.Dynamic.Core" version="1.2.8" targetFramework="net461" />
3939
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
4040
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
4141
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
@@ -51,5 +51,5 @@
5151
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
5252
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
5353
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
54-
<package id="TimeZoneConverter" version="3.3.0" targetFramework="net461" />
54+
<package id="TimeZoneConverter" version="3.4.0" targetFramework="net461" />
5555
</packages>

0 commit comments

Comments
 (0)