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

Merge branch 'v10/dev' into v11/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
This commit is contained in:
Sebastiaan Janssen
2023-03-17 08:56:55 +01:00
parent 180fae342e 9d1140165e
commit 70b6aaf963
4 changed files with 129 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/UmbracoProject/UmbracoProject.csproj
View File

@@ -26,6 +26,8 @@
<RazorCompileOnBuild>false</RazorCompileOnBuild>
<RazorCompileOnPublish>false</RazorCompileOnPublish>
</PropertyGroup>
<Import Project="..\PACKAGE_PROJECT_NAME_FROM_TEMPLATE\build\PACKAGE_PROJECT_NAME_FROM_TEMPLATE.targets" Condition="'$(PackageProjectName)' != ''" />
<Import Project="..\PACKAGE_PROJECT_NAME_FROM_TEMPLATE\buildTransitive\PACKAGE_PROJECT_NAME_FROM_TEMPLATE.targets" Condition="'$(PackageProjectName)' != ''" />
<ItemGroup Condition="'$(PackageProjectName)' != ''">