Skip to content

Commit 51b015f

Browse files
ismcagdasismcagdas
authored
Merge pull request #111 from aspnetboilerplate/pr/6438
Update packages to latest
2 parents ad38a8d + a723c63 commit 51b015f

File tree

21 files changed

+490
-527
lines changed

21 files changed

+490
-527
lines changed

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

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
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>
5353
</Reference>
54-
<Reference Include="Castle.Core.AsyncInterceptor, Version=2.0.21.0, Culture=neutral, PublicKeyToken=e33b67d3bb5581e4, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Castle.Core.AsyncInterceptor.2.0.21-alpha\lib\net45\Castle.Core.AsyncInterceptor.dll</HintPath>
54+
<Reference Include="Castle.Core.AsyncInterceptor, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e33b67d3bb5581e4, processorArchitecture=MSIL">
55+
<HintPath>..\packages\Castle.Core.AsyncInterceptor.2.1.0\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">
5858
<HintPath>..\packages\Castle.LoggingFacility.5.1.1\lib\net45\Castle.Facilities.Logging.dll</HintPath>
@@ -63,9 +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.3.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325">
67-
<HintPath>..\packages\JetBrains.Annotations.2021.3.0\lib\net20\JetBrains.Annotations.dll</HintPath>
68-
<Private>True</Private>
66+
<Reference Include="JetBrains.Annotations, Version=4242.42.42.42, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
67+
<HintPath>..\packages\JetBrains.Annotations.2022.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
6968
</Reference>
7069
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
7170
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -75,17 +74,15 @@
7574
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
7675
<Private>True</Private>
7776
</Reference>
78-
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
79-
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.6.0.0\lib\net461\Microsoft.Extensions.Caching.Memory.dll</HintPath>
80-
<Private>True</Private>
77+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=6.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.6.0.1\lib\net461\Microsoft.Extensions.Caching.Memory.dll</HintPath>
8179
</Reference>
8280
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
8381
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
8482
<Private>True</Private>
8583
</Reference>
86-
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
87-
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
88-
<Private>True</Private>
84+
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
85+
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.1\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
8986
</Reference>
9087
<Reference Include="Microsoft.Extensions.Options, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
9188
<HintPath>..\packages\Microsoft.Extensions.Options.6.0.0\lib\net461\Microsoft.Extensions.Options.dll</HintPath>
@@ -139,9 +136,8 @@
139136
<HintPath>..\packages\Nito.Collections.Deque.1.1.1\lib\net461\Nito.Collections.Deque.dll</HintPath>
140137
<Private>True</Private>
141138
</Reference>
142-
<Reference Include="Nito.Disposables, Version=2.2.1.0, Culture=neutral, PublicKeyToken=null">
143-
<HintPath>..\packages\Nito.Disposables.2.2.1\lib\net461\Nito.Disposables.dll</HintPath>
144-
<Private>True</Private>
139+
<Reference Include="Nito.Disposables, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
140+
<HintPath>..\packages\Nito.Disposables.2.3.0\lib\net461\Nito.Disposables.dll</HintPath>
145141
</Reference>
146142
<Reference Include="System" />
147143
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -169,9 +165,8 @@
169165
<Reference Include="System.Data.OracleClient" />
170166
<Reference Include="System.Drawing" />
171167
<Reference Include="System.IO.Compression.FileSystem" />
172-
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.14.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832">
173-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.14\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
174-
<Private>True</Private>
168+
<Reference Include="System.Linq.Dynamic.Core, Version=1.2.18.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
169+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.2.18\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
175170
</Reference>
176171
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
177172
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
@@ -242,8 +237,8 @@
242237
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
243238
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
244239
</Reference>
245-
<Reference Include="TimeZoneConverter, Version=3.5.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
246-
<HintPath>..\packages\TimeZoneConverter.3.5.0\lib\net461\TimeZoneConverter.dll</HintPath>
240+
<Reference Include="TimeZoneConverter, Version=5.0.0.0, Culture=neutral, PublicKeyToken=e20ab7d0d9479841, processorArchitecture=MSIL">
241+
<HintPath>..\packages\TimeZoneConverter.5.0.0\lib\net461\TimeZoneConverter.dll</HintPath>
247242
</Reference>
248243
<Reference Include="WindowsBase" />
249244
</ItemGroup>
@@ -271,12 +266,12 @@
271266
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
272267
<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'))" />
273268
<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'))" />
274-
<Error Condition="!Exists('..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets'))" />
275269
<Error Condition="!Exists('..\packages\Fody.6.6.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.6.0\build\Fody.targets'))" />
270+
<Error Condition="!Exists('..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.1\build\Microsoft.Extensions.Logging.Abstractions.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.1\build\Microsoft.Extensions.Logging.Abstractions.targets'))" />
276271
</Target>
277272
<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')" />
278-
<Import Project="..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets')" />
279273
<Import Project="..\packages\Fody.6.6.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.6.0\build\Fody.targets')" />
274+
<Import Project="..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.1\build\Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.1\build\Microsoft.Extensions.Logging.Abstractions.targets')" />
280275
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
281276
Other similar extension points exist, see Microsoft.Common.targets.
282277
<Target Name="BeforeBuild">

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,15 @@
244244
</dependentAssembly>
245245
<dependentAssembly>
246246
<assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
247-
<bindingRedirect oldVersion="0.0.0.0-3.1.2.0" newVersion="3.1.2.0" />
247+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
248248
</dependentAssembly>
249249
<dependentAssembly>
250250
<assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
251251
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
252252
</dependentAssembly>
253253
<dependentAssembly>
254254
<assemblyIdentity name="System.Linq.Dynamic.Core" publicKeyToken="0f07ec44de6ac832" culture="neutral" />
255-
<bindingRedirect oldVersion="0.0.0.0-1.0.22.0" newVersion="1.0.22.0" />
255+
<bindingRedirect oldVersion="0.0.0.0-1.2.18.0" newVersion="1.2.18.0" />
256256
</dependentAssembly>
257257
<dependentAssembly>
258258
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -264,7 +264,7 @@
264264
</dependentAssembly>
265265
<dependentAssembly>
266266
<assemblyIdentity name="TimeZoneConverter" publicKeyToken="e20ab7d0d9479841" culture="neutral" />
267-
<bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
267+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
268268
</dependentAssembly>
269269
<dependentAssembly>
270270
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -280,11 +280,11 @@
280280
</dependentAssembly>
281281
<dependentAssembly>
282282
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
283-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
283+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
284284
</dependentAssembly>
285285
<dependentAssembly>
286286
<assemblyIdentity name="Castle.Core.AsyncInterceptor" publicKeyToken="e33b67d3bb5581e4" culture="neutral" />
287-
<bindingRedirect oldVersion="0.0.0.0-2.0.21.0" newVersion="2.0.21.0" />
287+
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
288288
</dependentAssembly>
289289
</assemblyBinding>
290290
</runtime>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
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" />
8-
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
8+
<package id="Castle.Core.AsyncInterceptor" version="2.1.0" 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" />
1212
<package id="Fody" version="6.6.0" targetFramework="net461" developmentDependency="true" />
13-
<package id="JetBrains.Annotations" version="2021.3.0" targetFramework="net461" />
13+
<package id="JetBrains.Annotations" version="2022.1.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.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
1717
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
1818
<package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
19-
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.1" targetFramework="net461" />
2020
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
21-
<package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
21+
<package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.1" targetFramework="net461" />
2222
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
2323
<package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
2424
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
@@ -30,13 +30,13 @@
3030
<package id="Nito.AsyncEx.Tasks" version="5.1.2" targetFramework="net461" />
3131
<package id="Nito.Cancellation" version="1.1.2" targetFramework="net461" />
3232
<package id="Nito.Collections.Deque" version="1.1.1" targetFramework="net461" />
33-
<package id="Nito.Disposables" version="2.2.1" targetFramework="net461" />
33+
<package id="Nito.Disposables" version="2.3.0" targetFramework="net461" />
3434
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
3535
<package id="System.Collections.Immutable" version="6.0.0" targetFramework="net461" />
3636
<package id="System.ComponentModel.Annotations" version="6.0.0-preview.4.21253.7" targetFramework="net461" />
3737
<package id="System.Configuration.ConfigurationManager" version="6.0.0" targetFramework="net461" />
3838
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
39-
<package id="System.Linq.Dynamic.Core" version="1.2.14" targetFramework="net461" />
39+
<package id="System.Linq.Dynamic.Core" version="1.2.18" targetFramework="net461" />
4040
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
4141
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
4242
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
@@ -54,5 +54,5 @@
5454
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
5555
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
5656
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
57-
<package id="TimeZoneConverter" version="3.5.0" targetFramework="net461" />
57+
<package id="TimeZoneConverter" version="5.0.0" targetFramework="net461" />
5858
</packages>

0 commit comments

Comments
 (0)