Skip to content

Commit a583f13

Browse files
ismcagdasismcagdas
authored
Merge pull request #192 from aspnetboilerplate/pr/6203
Upgrade to ABP 6.4.0
2 parents 8c51139 + b726e67 commit a583f13

File tree

19 files changed

+292
-284
lines changed

19 files changed

+292
-284
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="Abp, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.6.4.0-rc1\lib\netstandard2.0\Abp.dll</HintPath>
40+
<HintPath>..\packages\Abp.6.4.0\lib\netstandard2.0\Abp.dll</HintPath>
4141
</Reference>
4242
<Reference Include="Abp.AutoMapper, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.AutoMapper.6.4.0-rc1\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
43+
<HintPath>..\packages\Abp.AutoMapper.6.4.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4444
</Reference>
4545
<Reference Include="Abp.Zero, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Abp.Zero.6.4.0-rc1\lib\net461\Abp.Zero.dll</HintPath>
46+
<HintPath>..\packages\Abp.Zero.6.4.0\lib\net461\Abp.Zero.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Abp.Zero.Common, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Abp.Zero.Common.6.4.0-rc1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
49+
<HintPath>..\packages\Abp.Zero.Common.6.4.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>
@@ -69,8 +69,8 @@
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.3.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
73-
<HintPath>..\packages\JetBrains.Annotations.2020.3.0\lib\net20\JetBrains.Annotations.dll</HintPath>
72+
<Reference Include="JetBrains.Annotations, Version=2021.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
73+
<HintPath>..\packages\JetBrains.Annotations.2021.1.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>
@@ -103,8 +103,8 @@
103103
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
104104
</Reference>
105105
<Reference Include="mscorlib" />
106-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
107-
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
106+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
107+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
108108
</Reference>
109109
<Reference Include="Nito.AsyncEx.Context, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
110110
<HintPath>..\packages\Nito.AsyncEx.Context.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Context.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.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>
156+
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.10.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
157+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.10\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.4.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
222-
<HintPath>..\packages\TimeZoneConverter.3.4.0\lib\net461\TimeZoneConverter.dll</HintPath>
221+
<Reference Include="TimeZoneConverter, Version=3.5.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
222+
<HintPath>..\packages\TimeZoneConverter.3.5.0\lib\net461\TimeZoneConverter.dll</HintPath>
223223
</Reference>
224224
<Reference Include="WindowsBase" />
225225
</ItemGroup>

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

Lines changed: 8 additions & 8 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="6.4.0-rc1" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="6.4.0-rc1" targetFramework="net461" />
5-
<package id="Abp.Zero" version="6.4.0-rc1" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="6.4.0-rc1" targetFramework="net461" />
3+
<package id="Abp" version="6.4.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="6.4.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="6.4.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="6.4.0" targetFramework="net461" />
77
<package id="AutoMapper" version="10.1.1" targetFramework="net461" />
88
<package id="AutoMapper.Collection" version="7.0.1" targetFramework="net461" />
99
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
@@ -12,7 +12,7 @@
1212
<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.3.0" targetFramework="net461" />
15+
<package id="JetBrains.Annotations" version="2021.1.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" />
@@ -23,7 +23,7 @@
2323
<package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net461" />
2424
<package id="Microsoft.Extensions.Options" version="5.0.0" targetFramework="net461" />
2525
<package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net461" />
26-
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
26+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
2727
<package id="Nito.AsyncEx" version="5.1.0" targetFramework="net461" />
2828
<package id="Nito.AsyncEx.Context" version="5.1.0" targetFramework="net461" />
2929
<package id="Nito.AsyncEx.Coordination" version="5.1.0" 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.8" targetFramework="net461" />
41+
<package id="System.Linq.Dynamic.Core" version="1.2.10" 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.4.0" targetFramework="net461" />
58+
<package id="TimeZoneConverter" version="3.5.0" targetFramework="net461" />
5959
</packages>

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="Abp, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.6.4.0-rc1\lib\netstandard2.0\Abp.dll</HintPath>
40+
<HintPath>..\packages\Abp.6.4.0\lib\netstandard2.0\Abp.dll</HintPath>
4141
</Reference>
4242
<Reference Include="Abp.Zero, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.Zero.6.4.0-rc1\lib\net461\Abp.Zero.dll</HintPath>
43+
<HintPath>..\packages\Abp.Zero.6.4.0\lib\net461\Abp.Zero.dll</HintPath>
4444
</Reference>
4545
<Reference Include="Abp.Zero.Common, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Abp.Zero.Common.6.4.0-rc1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
46+
<HintPath>..\packages\Abp.Zero.Common.6.4.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>
@@ -60,8 +60,8 @@
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.3.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
64-
<HintPath>..\packages\JetBrains.Annotations.2020.3.0\lib\net20\JetBrains.Annotations.dll</HintPath>
63+
<Reference Include="JetBrains.Annotations, Version=2021.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
64+
<HintPath>..\packages\JetBrains.Annotations.2021.1.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>
@@ -93,8 +93,8 @@
9393
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
9494
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
9595
</Reference>
96-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
97-
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
96+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
97+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
9898
</Reference>
9999
<Reference Include="Nito.AsyncEx.Context, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
100100
<HintPath>..\packages\Nito.AsyncEx.Context.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Context.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.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>
146+
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.10.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
147+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.10\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.4.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
209-
<HintPath>..\packages\TimeZoneConverter.3.4.0\lib\net461\TimeZoneConverter.dll</HintPath>
208+
<Reference Include="TimeZoneConverter, Version=3.5.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
209+
<HintPath>..\packages\TimeZoneConverter.3.5.0\lib\net461\TimeZoneConverter.dll</HintPath>
210210
</Reference>
211211
<Reference Include="WindowsBase" />
212212
</ItemGroup>

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

Lines changed: 7 additions & 7 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.4.0-rc1" targetFramework="net461" />
4-
<package id="Abp.Zero" version="6.4.0-rc1" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="6.4.0-rc1" targetFramework="net461" />
3+
<package id="Abp" version="6.4.0" targetFramework="net461" />
4+
<package id="Abp.Zero" version="6.4.0" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="6.4.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" />
88
<package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
99
<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.3.0" targetFramework="net461" />
12+
<package id="JetBrains.Annotations" version="2021.1.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" />
@@ -20,7 +20,7 @@
2020
<package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net461" />
2121
<package id="Microsoft.Extensions.Options" version="5.0.0" targetFramework="net461" />
2222
<package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net461" />
23-
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
23+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
2424
<package id="Nito.AsyncEx" version="5.1.0" targetFramework="net461" />
2525
<package id="Nito.AsyncEx.Context" version="5.1.0" targetFramework="net461" />
2626
<package id="Nito.AsyncEx.Coordination" version="5.1.0" 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.8" targetFramework="net461" />
38+
<package id="System.Linq.Dynamic.Core" version="1.2.10" 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.4.0" targetFramework="net461" />
54+
<package id="TimeZoneConverter" version="3.5.0" targetFramework="net461" />
5555
</packages>

0 commit comments

Comments
 (0)