Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-namespaces

# Conflicts:
#	src/Umbraco.Infrastructure/Search/ExamineComposer.cs
This commit is contained in:
Mole
2021-02-15 15:45:03 +01:00
12 changed files with 22 additions and 40 deletions

View File

@@ -4,6 +4,7 @@
<TargetFramework>net5.0</TargetFramework>
<RootNamespace>Umbraco.Cms.Web.UI.NetCore</RootNamespace>
<LangVersion>latest</LangVersion>
<RootNamespace>Umbraco.Web.UI.NetCore</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DocumentationFile>bin\Release\Umbraco.Web.UI.NetCore.xml</DocumentationFile>