Skip to content

Commit bdf8c18

Browse files
ismcagdasismcagdas
authored
Merge pull request #196 from aspnetboilerplate/feat/abp-6.5-upgrade
Upgraded to ABP 6.5
2 parents a583f13 + a407957 commit bdf8c18

File tree

125 files changed

+79541
-77650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+79541
-77650
lines changed

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

Lines changed: 16 additions & 16 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.4.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.6.4.0\lib\netstandard2.0\Abp.dll</HintPath>
39+
<Reference Include="Abp, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.6.5.0\lib\netstandard2.0\Abp.dll</HintPath>
4141
</Reference>
42-
<Reference Include="Abp.AutoMapper, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.AutoMapper.6.4.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
42+
<Reference Include="Abp.AutoMapper, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.AutoMapper.6.5.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Abp.Zero, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Abp.Zero.6.4.0\lib\net461\Abp.Zero.dll</HintPath>
45+
<Reference Include="Abp.Zero, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.Zero.6.5.0\lib\net461\Abp.Zero.dll</HintPath>
4747
</Reference>
48-
<Reference Include="Abp.Zero.Common, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Abp.Zero.Common.6.4.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
48+
<Reference Include="Abp.Zero.Common, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Zero.Common.6.5.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=2021.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
73-
<HintPath>..\packages\JetBrains.Annotations.2021.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
72+
<Reference Include="JetBrains.Annotations, Version=2021.2.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
73+
<HintPath>..\packages\JetBrains.Annotations.2021.2.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>
@@ -90,8 +90,8 @@
9090
<Reference Include="Microsoft.Extensions.Options, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
9191
<HintPath>..\packages\Microsoft.Extensions.Options.5.0.0\lib\net461\Microsoft.Extensions.Options.dll</HintPath>
9292
</Reference>
93-
<Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
94-
<HintPath>..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
93+
<Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
94+
<HintPath>..\packages\Microsoft.Extensions.Primitives.5.0.1\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
9595
</Reference>
9696
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
9797
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.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.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>
156+
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.12.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
157+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.12\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>
@@ -278,11 +278,11 @@
278278
</PropertyGroup>
279279
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
280280
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
281-
<Error Condition="!Exists('..\packages\Fody.6.0.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.0.2\build\Fody.targets'))" />
282281
<Error Condition="!Exists('..\packages\ConfigureAwait.Fody.3.3.1\build\ConfigureAwait.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ConfigureAwait.Fody.3.3.1\build\ConfigureAwait.Fody.props'))" />
282+
<Error Condition="!Exists('..\packages\Fody.6.5.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.5.3\build\Fody.targets'))" />
283283
</Target>
284284
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
285-
<Import Project="..\packages\Fody.6.0.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.2\build\Fody.targets')" />
285+
<Import Project="..\packages\Fody.6.5.3\build\Fody.targets" Condition="Exists('..\packages\Fody.6.5.3\build\Fody.targets')" />
286286
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
287287
Other similar extension points exist, see Microsoft.Common.targets.
288288
<Target Name="BeforeBuild">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@
272272
</dependentAssembly>
273273
<dependentAssembly>
274274
<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
275-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
275+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
276276
</dependentAssembly>
277277
<dependentAssembly>
278278
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />

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

Lines changed: 8 additions & 8 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.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" />
3+
<package id="Abp" version="6.5.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="6.5.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="6.5.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="6.5.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" />
1010
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
1111
<package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
1212
<package id="Castle.Windsor" version="5.1.1" targetFramework="net461" />
1313
<package id="ConfigureAwait.Fody" version="3.3.1" targetFramework="net461" />
14-
<package id="Fody" version="6.0.2" targetFramework="net461" developmentDependency="true" />
15-
<package id="JetBrains.Annotations" version="2021.1.0" targetFramework="net461" />
14+
<package id="Fody" version="6.5.3" targetFramework="net461" developmentDependency="true" />
15+
<package id="JetBrains.Annotations" version="2021.2.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" />
@@ -22,7 +22,7 @@
2222
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="5.0.0" targetFramework="net461" />
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" />
25-
<package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net461" />
25+
<package id="Microsoft.Extensions.Primitives" version="5.0.1" targetFramework="net461" />
2626
<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" />
@@ -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.10" targetFramework="net461" />
41+
<package id="System.Linq.Dynamic.Core" version="1.2.12" 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" />

‎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.4.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.6.4.0\lib\netstandard2.0\Abp.dll</HintPath>
39+
<Reference Include="Abp, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.6.5.0\lib\netstandard2.0\Abp.dll</HintPath>
4141
</Reference>
42-
<Reference Include="Abp.Zero, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.Zero.6.4.0\lib\net461\Abp.Zero.dll</HintPath>
42+
<Reference Include="Abp.Zero, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.Zero.6.5.0\lib\net461\Abp.Zero.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Abp.Zero.Common, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Abp.Zero.Common.6.4.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
45+
<Reference Include="Abp.Zero.Common, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.Zero.Common.6.5.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=2021.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
64-
<HintPath>..\packages\JetBrains.Annotations.2021.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
63+
<Reference Include="JetBrains.Annotations, Version=2021.2.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
64+
<HintPath>..\packages\JetBrains.Annotations.2021.2.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>
@@ -81,8 +81,8 @@
8181
<Reference Include="Microsoft.Extensions.Options, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
8282
<HintPath>..\packages\Microsoft.Extensions.Options.5.0.0\lib\net461\Microsoft.Extensions.Options.dll</HintPath>
8383
</Reference>
84-
<Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
85-
<HintPath>..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
84+
<Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
85+
<HintPath>..\packages\Microsoft.Extensions.Primitives.5.0.1\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
8686
</Reference>
8787
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8888
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.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.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>
146+
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.12.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
147+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.12\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>
@@ -277,11 +277,11 @@
277277
</PropertyGroup>
278278
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
279279
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
280-
<Error Condition="!Exists('..\packages\Fody.6.0.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.0.2\build\Fody.targets'))" />
281280
<Error Condition="!Exists('..\packages\ConfigureAwait.Fody.3.3.1\build\ConfigureAwait.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ConfigureAwait.Fody.3.3.1\build\ConfigureAwait.Fody.props'))" />
281+
<Error Condition="!Exists('..\packages\Fody.6.5.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.5.3\build\Fody.targets'))" />
282282
</Target>
283283
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
284-
<Import Project="..\packages\Fody.6.0.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.2\build\Fody.targets')" />
284+
<Import Project="..\packages\Fody.6.5.3\build\Fody.targets" Condition="Exists('..\packages\Fody.6.5.3\build\Fody.targets')" />
285285
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
286286
Other similar extension points exist, see Microsoft.Common.targets.
287287
<Target Name="BeforeBuild">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268
</dependentAssembly>
269269
<dependentAssembly>
270270
<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
271-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
271+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
272272
</dependentAssembly>
273273
<dependentAssembly>
274274
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />

0 commit comments

Comments
 (0)