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

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

Browse Source 
# Conflicts:
#	src/Umbraco.Cms.Api.Delivery/Services/ApiContentQueryService.cs
#	src/Umbraco.Core/CompatibilitySuppressions.xml
#	src/Umbraco.Core/DeliveryApi/IApiContentQueryProvider.cs
#	src/Umbraco.Core/DeliveryApi/IApiContentQueryService.cs
#	src/Umbraco.Core/DeliveryApi/NoopApiContentQueryService.cs
This commit is contained in:
Bjarke Berg
2023-05-25 14:48:33 +02:00
parent 32b3b3b4a0 efb9452678
commit b9c0e18fb1
18 changed files with 374 additions and 14484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/azure-pipelines.yml
View File

@@ -23,7 +23,7 @@ parameters:
default: false
variables:
nodeVersion: 16.17.0
nodeVersion: 18.16.0
dotnetVersion: 7.x
dotnetIncludePreviewVersions: true
solution: umbraco.sln