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

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB4822-nuget-packages-basis

Browse Source
This commit is contained in:
Bjarke Berg
2020-07-09 18:03:15 +02:00
parent a2fa6e521d 31a6126a5c
commit 66a549c89b
223 changed files with 7041 additions and 7141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
View File

@@ -10,6 +10,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj" />
<ProjectReference Include="..\Umbraco.Persistance.SqlCe\Umbraco.Persistance.SqlCe.csproj" />
<ProjectReference Include="..\Umbraco.PublishedCache.NuCache\Umbraco.PublishedCache.NuCache.csproj" />
<ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
<ProjectReference Include="..\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />
@@ -19,6 +20,7 @@
<ItemGroup>
<Folder Include="css" />
<Folder Include="Umbraco" />
<Folder Include="Views" />
<Folder Include="Views\" />
<Folder Include="wwwroot\Media" />
<Folder Include="wwwroot\Umbraco\views\install" />
@@ -62,6 +64,23 @@
<SubType>Designer</SubType>
</Content>
<Content Remove="wwwroot\Web.config" />
<Content Remove="Umbraco\PartialViewMacros\Templates\Gallery.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\ListAncestorsFromCurrentPage.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesFromChangeableSource.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesFromCurrentPage.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesOrderedByDate.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesOrderedByName.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesOrderedByProperty.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesWithDoctype.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\ListDescendantsFromCurrentPage.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\ListImagesFromMediaFolder.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\Login.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\LoginStatus.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\MultinodeTree-picker.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\Navigation.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\RegisterMember.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\SiteMap.cshtml" />
<Content Remove="Umbraco\PartialViewMacros\Templates\EditProfile.cshtml" />
</ItemGroup>
<ItemGroup>
@@ -104,4 +123,8 @@
</Content>
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="Umbraco\PartialViewMacros\Templates\Empty.cshtml" />
</ItemGroup>
</Project>