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 v13/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs
#	src/Umbraco.Core/CompatibilitySuppressions.xml
#	src/Umbraco.Infrastructure/CompatibilitySuppressions.xml
This commit is contained in:
Bjarke Berg
2023-04-19 11:23:50 +02:00
parent cb682e2f3e c06e89af64
commit fff393c9ed
182 changed files with 6893 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
umbraco.sln
View File

@@ -182,6 +182,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.New.Client",
VWDPort = "55211"
SlnRelativePath = "src\Umbraco.Web.UI.New.Client\"
EndProjectSection
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Api.Delivery", "src\Umbraco.Cms.Api.Delivery\Umbraco.Cms.Api.Delivery.csproj", "{9AA3D21F-81A9-4F27-85D1-CE850B59DC2D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -350,6 +351,12 @@ Global
{C55CA725-9F4E-4618-9435-6B8AE05DA14D}.Release|Any CPU.Build.0 = Release|Any CPU
{C55CA725-9F4E-4618-9435-6B8AE05DA14D}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU
{C55CA725-9F4E-4618-9435-6B8AE05DA14D}.SkipTests|Any CPU.Build.0 = Debug|Any CPU
{9AA3D21F-81A9-4F27-85D1-CE850B59DC2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9AA3D21F-81A9-4F27-85D1-CE850B59DC2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9AA3D21F-81A9-4F27-85D1-CE850B59DC2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9AA3D21F-81A9-4F27-85D1-CE850B59DC2D}.Release|Any CPU.Build.0 = Release|Any CPU
{9AA3D21F-81A9-4F27-85D1-CE850B59DC2D}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU
{9AA3D21F-81A9-4F27-85D1-CE850B59DC2D}.SkipTests|Any CPU.Build.0 = Debug|Any CPU
{D48B5D6B-82FF-4235-986C-CDE646F41DEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D48B5D6B-82FF-4235-986C-CDE646F41DEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D48B5D6B-82FF-4235-986C-CDE646F41DEC}.Release|Any CPU.ActiveCfg = Release|Any CPU