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

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

Browse Source 
# Conflicts:
#	version.json
This commit is contained in:
Bjarke Berg
2023-11-16 09:09:08 +01:00
parent 696867b305 eb0c1cd4a9
commit 5b3e9c580a
28 changed files with 193 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
View File

@@ -4,8 +4,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0-rc.2.*" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Moq" Version="4.18.4" />
</ItemGroup>

2
tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
View File

@@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Bogus" Version="34.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-rc.2.*" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" PrivateAssets="all" />

4
tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
View File

@@ -10,8 +10,8 @@
<PackageReference Include="AngleSharp" Version="1.0.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="System.Data.Odbc" Version="8.0.0-rc.2.*" />
<PackageReference Include="System.Data.OleDb" Version="8.0.0-rc.2.*" />
<PackageReference Include="System.Data.Odbc" Version="8.0.0" />
<PackageReference Include="System.Data.OleDb" Version="8.0.0" />
</ItemGroup>
<ItemGroup>