yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v11/dev' into v12/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Cms.ManagementApi/Umbraco.Cms.ManagementApi.csproj
#	src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs
This commit is contained in:
Bjarke Berg
2023-11-13 18:40:11 +01:00
parent e0220cb47f 74cfd9c9a0
commit 633f649be9
16 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
View File

@@ -15,6 +15,9 @@
<PackageReference Include="HtmlAgilityPack" Version="1.11.48" />
<PackageReference Include="IPNetwork2" Version="2.6.589" />
<PackageReference Include="MailKit" Version="4.1.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
<PackageReference Include="IPNetwork2" Version="2.6.618" />
<PackageReference Include="MailKit" Version="3.6.0" />
<PackageReference Include="Markdown" Version="2.2.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
@@ -28,6 +31,13 @@
<PackageReference Include="NPoco" Version="5.7.1" />
<PackageReference Include="OpenIddict.Abstractions" Version="4.5.0" />
<PackageReference Include="Serilog" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="7.0.13" />
<PackageReference Include="MiniProfiler.Shared" Version="4.2.22" />
<PackageReference Include="NPoco" Version="5.5.0" />
<PackageReference Include="ncrontab" Version="3.3.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NPoco.SqlServer" Version="5.3.2" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Enrichers.Process" Version="2.0.2" />
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
<PackageReference Include="Serilog.Expressions" Version="3.4.1" />
@@ -40,6 +50,7 @@
<PackageReference Include="Serilog.Sinks.Map" Version="1.0.2" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.2" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.3" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
</ItemGroup>