Skip to content

Commit 8844c2f

Browse files
ismcagdasismcagdas
authored
Merge pull request #104 from aspnetboilerplate/pr/6073
Update abp packages to v6.3
2 parents b6515ab + c51b170 commit 8844c2f

File tree

18 files changed

+271
-271
lines changed

18 files changed

+271
-271
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@
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>
4545
<Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
4646
<HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
4747
</Reference>
4848
<Reference Include="AutoMapper.Collection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=e57c3f0a3d6646db, processorArchitecture=MSIL">
49-
<HintPath>..\packages\AutoMapper.Collection.7.0.0\lib\net461\AutoMapper.Collection.dll</HintPath>
49+
<HintPath>..\packages\AutoMapper.Collection.7.0.1\lib\net461\AutoMapper.Collection.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5252
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
@@ -55,16 +55,16 @@
5555
<HintPath>..\packages\Castle.Core.AsyncInterceptor.2.0.21-alpha\lib\net45\Castle.Core.AsyncInterceptor.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Castle.Facilities.Logging, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
58-
<HintPath>..\packages\Castle.LoggingFacility.5.1.0-beta001\lib\net45\Castle.Facilities.Logging.dll</HintPath>
58+
<HintPath>..\packages\Castle.LoggingFacility.5.1.1\lib\net45\Castle.Facilities.Logging.dll</HintPath>
5959
</Reference>
6060
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Castle.Windsor.5.1.0-beta001\lib\net45\Castle.Windsor.dll</HintPath>
61+
<HintPath>..\packages\Castle.Windsor.5.1.1\lib\net45\Castle.Windsor.dll</HintPath>
6262
</Reference>
6363
<Reference Include="ConfigureAwait, Version=3.3.1.0, Culture=neutral, PublicKeyToken=233850a516558a98, processorArchitecture=MSIL">
6464
<HintPath>..\packages\ConfigureAwait.Fody.3.3.1\lib\net452\ConfigureAwait.dll</HintPath>
6565
</Reference>
66-
<Reference Include="JetBrains.Annotations, Version=2020.2.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
67-
<HintPath>..\packages\JetBrains.Annotations.2020.2.0-eap\lib\net20\JetBrains.Annotations.dll</HintPath>
66+
<Reference Include="JetBrains.Annotations, Version=2020.3.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
67+
<HintPath>..\packages\JetBrains.Annotations.2020.3.0\lib\net20\JetBrains.Annotations.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
7070
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
@@ -146,8 +146,8 @@
146146
<Reference Include="System.Data.OracleClient" />
147147
<Reference Include="System.Drawing" />
148148
<Reference Include="System.IO.Compression.FileSystem" />
149-
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.5.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
150-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.5\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
149+
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.8.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
150+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.8\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
151151
</Reference>
152152
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
153153
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
@@ -211,8 +211,8 @@
211211
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
212212
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
213213
</Reference>
214-
<Reference Include="TimeZoneConverter, Version=3.3.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
215-
<HintPath>..\packages\TimeZoneConverter.3.3.0\lib\net461\TimeZoneConverter.dll</HintPath>
214+
<Reference Include="TimeZoneConverter, Version=3.4.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
215+
<HintPath>..\packages\TimeZoneConverter.3.4.0\lib\net461\TimeZoneConverter.dll</HintPath>
216216
</Reference>
217217
<Reference Include="WindowsBase" />
218218
</ItemGroup>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
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" />
3+
<package id="Abp" version="6.3.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="6.3.0" targetFramework="net461" />
55
<package id="AutoMapper" version="10.1.1" targetFramework="net461" />
6-
<package id="AutoMapper.Collection" version="7.0.0" targetFramework="net461" />
6+
<package id="AutoMapper.Collection" version="7.0.1" targetFramework="net461" />
77
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
88
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
9-
<package id="Castle.LoggingFacility" version="5.1.0-beta001" targetFramework="net461" />
10-
<package id="Castle.Windsor" version="5.1.0-beta001" targetFramework="net461" />
9+
<package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
10+
<package id="Castle.Windsor" version="5.1.1" targetFramework="net461" />
1111
<package id="ConfigureAwait.Fody" version="3.3.1" targetFramework="net461" />
1212
<package id="Fody" version="6.0.2" targetFramework="net461" developmentDependency="true" />
13-
<package id="JetBrains.Annotations" version="2020.2.0-eap" targetFramework="net461" />
13+
<package id="JetBrains.Annotations" version="2020.3.0" targetFramework="net461" />
1414
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
1616
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
@@ -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" />
@@ -52,5 +52,5 @@
5252
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
5353
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
5454
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
55-
<package id="TimeZoneConverter" version="3.3.0" targetFramework="net461" />
55+
<package id="TimeZoneConverter" version="3.4.0" targetFramework="net461" />
5656
</packages>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
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>
4242
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4343
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
@@ -46,16 +46,16 @@
4646
<HintPath>..\packages\Castle.Core.AsyncInterceptor.2.0.21-alpha\lib\net45\Castle.Core.AsyncInterceptor.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Castle.Facilities.Logging, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Castle.LoggingFacility.5.1.0-beta001\lib\net45\Castle.Facilities.Logging.dll</HintPath>
49+
<HintPath>..\packages\Castle.LoggingFacility.5.1.1\lib\net45\Castle.Facilities.Logging.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Castle.Windsor.5.1.0-beta001\lib\net45\Castle.Windsor.dll</HintPath>
52+
<HintPath>..\packages\Castle.Windsor.5.1.1\lib\net45\Castle.Windsor.dll</HintPath>
5353
</Reference>
5454
<Reference Include="ConfigureAwait, Version=3.3.1.0, Culture=neutral, PublicKeyToken=233850a516558a98, processorArchitecture=MSIL">
5555
<HintPath>..\packages\ConfigureAwait.Fody.3.3.1\lib\net452\ConfigureAwait.dll</HintPath>
5656
</Reference>
57-
<Reference Include="JetBrains.Annotations, Version=2020.2.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
58-
<HintPath>..\packages\JetBrains.Annotations.2020.2.0-eap\lib\net20\JetBrains.Annotations.dll</HintPath>
57+
<Reference Include="JetBrains.Annotations, Version=2020.3.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
58+
<HintPath>..\packages\JetBrains.Annotations.2020.3.0\lib\net20\JetBrains.Annotations.dll</HintPath>
5959
</Reference>
6060
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
6161
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
@@ -137,8 +137,8 @@
137137
<Reference Include="System.Data.OracleClient" />
138138
<Reference Include="System.Drawing" />
139139
<Reference Include="System.IO.Compression.FileSystem" />
140-
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.5.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
141-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.5\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
140+
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.8.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
141+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.8\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
142142
</Reference>
143143
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
144144
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
@@ -199,8 +199,8 @@
199199
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
200200
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
201201
</Reference>
202-
<Reference Include="TimeZoneConverter, Version=3.3.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
203-
<HintPath>..\packages\TimeZoneConverter.3.3.0\lib\net461\TimeZoneConverter.dll</HintPath>
202+
<Reference Include="TimeZoneConverter, Version=3.4.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
203+
<HintPath>..\packages\TimeZoneConverter.3.4.0\lib\net461\TimeZoneConverter.dll</HintPath>
204204
</Reference>
205205
<Reference Include="WindowsBase" />
206206
</ItemGroup>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="6.2.0" targetFramework="net461" />
3+
<package id="Abp" version="6.3.0" targetFramework="net461" />
44
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
55
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
6-
<package id="Castle.LoggingFacility" version="5.1.0-beta001" targetFramework="net461" />
7-
<package id="Castle.Windsor" version="5.1.0-beta001" targetFramework="net461" />
6+
<package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
7+
<package id="Castle.Windsor" version="5.1.1" targetFramework="net461" />
88
<package id="ConfigureAwait.Fody" version="3.3.1" targetFramework="net461" />
99
<package id="Fody" version="6.0.2" targetFramework="net461" developmentDependency="true" />
10-
<package id="JetBrains.Annotations" version="2020.2.0-eap" targetFramework="net461" />
10+
<package id="JetBrains.Annotations" version="2020.3.0" targetFramework="net461" />
1111
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1212
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
1313
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
@@ -32,7 +32,7 @@
3232
<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net461" />
3333
<package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net461" />
3434
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
35-
<package id="System.Linq.Dynamic.Core" version="1.2.5" targetFramework="net461" />
35+
<package id="System.Linq.Dynamic.Core" version="1.2.8" targetFramework="net461" />
3636
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3737
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
3838
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
@@ -48,5 +48,5 @@
4848
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
4949
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
5050
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
51-
<package id="TimeZoneConverter" version="3.3.0" targetFramework="net461" />
51+
<package id="TimeZoneConverter" version="3.4.0" targetFramework="net461" />
5252
</packages>

0 commit comments

Comments
 (0)