Skip to content

Commit 93e02c2

Browse files
ismcagdasismcagdas
committed
upgraded to ABP 6.5
1 parent a93df2d commit 93e02c2

File tree

290 files changed

+66514
-23573
lines changed

Some content is hidden

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

290 files changed

+66514
-23573
lines changed

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

+18-18
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
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>
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>
@@ -63,8 +63,8 @@
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=2021.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
67-
<HintPath>..\packages\JetBrains.Annotations.2021.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
66+
<Reference Include="JetBrains.Annotations, Version=2021.2.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
67+
<HintPath>..\packages\JetBrains.Annotations.2021.2.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>
@@ -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>
@@ -105,17 +105,17 @@
105105
<Reference Include="Nito.AsyncEx.Coordination, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
106106
<HintPath>..\packages\Nito.AsyncEx.Coordination.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Coordination.dll</HintPath>
107107
</Reference>
108-
<Reference Include="Nito.AsyncEx.Interop.WaitHandles, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
109-
<HintPath>..\packages\Nito.AsyncEx.Interop.WaitHandles.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Interop.WaitHandles.dll</HintPath>
108+
<Reference Include="Nito.AsyncEx.Interop.WaitHandles, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
109+
<HintPath>..\packages\Nito.AsyncEx.Interop.WaitHandles.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Interop.WaitHandles.dll</HintPath>
110110
</Reference>
111-
<Reference Include="Nito.AsyncEx.Oop, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
112-
<HintPath>..\packages\Nito.AsyncEx.Oop.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Oop.dll</HintPath>
111+
<Reference Include="Nito.AsyncEx.Oop, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
112+
<HintPath>..\packages\Nito.AsyncEx.Oop.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Oop.dll</HintPath>
113113
</Reference>
114114
<Reference Include="Nito.AsyncEx.Tasks, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
115115
<HintPath>..\packages\Nito.AsyncEx.Tasks.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Tasks.dll</HintPath>
116116
</Reference>
117-
<Reference Include="Nito.Cancellation, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
118-
<HintPath>..\packages\Nito.Cancellation.1.0.5\lib\netstandard2.0\Nito.Cancellation.dll</HintPath>
117+
<Reference Include="Nito.Cancellation, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
118+
<HintPath>..\packages\Nito.Cancellation.1.1.0\lib\netstandard2.0\Nito.Cancellation.dll</HintPath>
119119
</Reference>
120120
<Reference Include="Nito.Collections.Deque, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
121121
<HintPath>..\packages\Nito.Collections.Deque.1.1.0\lib\netstandard2.0\Nito.Collections.Deque.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.10.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
150-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.10\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
149+
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.12.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
150+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.12\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>
@@ -239,11 +239,11 @@
239239
</PropertyGroup>
240240
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
241241
<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'))" />
242-
<Error Condition="!Exists('..\packages\Fody.6.0.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.0.2\build\Fody.targets'))" />
243242
<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'))" />
243+
<Error Condition="!Exists('..\packages\Fody.6.5.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.5.3\build\Fody.targets'))" />
244244
</Target>
245245
<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')" />
246-
<Import Project="..\packages\Fody.6.0.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.2\build\Fody.targets')" />
246+
<Import Project="..\packages\Fody.6.5.3\build\Fody.targets" Condition="Exists('..\packages\Fody.6.5.3\build\Fody.targets')" />
247247
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
248248
Other similar extension points exist, see Microsoft.Common.targets.
249249
<Target Name="BeforeBuild">

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

+1-1
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

+10-10
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.4.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" 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" />
55
<package id="AutoMapper" version="10.1.1" targetFramework="net461" />
66
<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" />
99
<package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
1010
<package id="Castle.Windsor" version="5.1.1" targetFramework="net461" />
1111
<package id="ConfigureAwait.Fody" version="3.3.1" targetFramework="net461" />
12-
<package id="Fody" version="6.0.2" targetFramework="net461" developmentDependency="true" />
13-
<package id="JetBrains.Annotations" version="2021.1.0" targetFramework="net461" />
12+
<package id="Fody" version="6.5.3" targetFramework="net461" developmentDependency="true" />
13+
<package id="JetBrains.Annotations" version="2021.2.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" />
@@ -19,23 +19,23 @@
1919
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="5.0.0" targetFramework="net461" />
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" />
22-
<package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net461" />
22+
<package id="Microsoft.Extensions.Primitives" version="5.0.1" targetFramework="net461" />
2323
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
24-
<package id="Nito.AsyncEx" version="5.0.0" targetFramework="net461" />
24+
<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" />
27-
<package id="Nito.AsyncEx.Interop.WaitHandles" version="5.0.0" targetFramework="net461" />
28-
<package id="Nito.AsyncEx.Oop" version="5.0.0" targetFramework="net461" />
27+
<package id="Nito.AsyncEx.Interop.WaitHandles" version="5.1.0" targetFramework="net461" />
28+
<package id="Nito.AsyncEx.Oop" version="5.1.0" targetFramework="net461" />
2929
<package id="Nito.AsyncEx.Tasks" version="5.1.0" targetFramework="net461" />
30-
<package id="Nito.Cancellation" version="1.0.5" targetFramework="net461" />
30+
<package id="Nito.Cancellation" version="1.1.0" targetFramework="net461" />
3131
<package id="Nito.Collections.Deque" version="1.1.0" targetFramework="net461" />
3232
<package id="Nito.Disposables" version="2.2.0" targetFramework="net461" />
3333
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
3434
<package id="System.Collections.Immutable" version="5.0.0" targetFramework="net461" />
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.10" targetFramework="net461" />
38+
<package id="System.Linq.Dynamic.Core" version="1.2.12" 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" />

0 commit comments

Comments
 (0)