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

Merge remote-tracking branch 'origin/v14/dev' into v15/dev

Browse Source 
# Conflicts:
#	Directory.Packages.props
#	src/Umbraco.Web.UI.Client
#	tests/Directory.Packages.props
This commit is contained in:
Bjarke Berg
2024-09-04 15:06:32 +02:00
parent 5a7d563b8a 3b3c9c57ca
commit a2c30d9aff
17 changed files with 167 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Directory.Packages.props
View File

@@ -4,7 +4,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Packages.props, $(MSBuildThisFileDirectory)..))" />
<ItemGroup>
<!-- Microsoft packages -->
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.5.24306.11" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-preview.5.24306.7" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />