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/better-linux-support

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
This commit is contained in:
Bjarke Berg
2020-08-11 08:30:18 +02:00
parent 790a3b26bf 3c2f2ac0b3
commit 1123b8bea5
345 changed files with 28462 additions and 3102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,12 +17,6 @@
<ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Views" />
<Folder Include="Views\" />
<Folder Include="wwwroot\Media" />
</ItemGroup>
<ItemGroup>
<Compile Remove="App_Data\**" />
</ItemGroup>
@@ -31,58 +25,6 @@
<EmbeddedResource Remove="App_Data\**" />
</ItemGroup>
<ItemGroup>
<None Remove="App_Data\**" />
<None Include="config\tinyMceConfig.Release.config">
<DependentUpon>tinyMceConfig.config</DependentUpon>
<SubType>Designer</SubType>
</None>
<None Include="config\umbracoSettings.Release.config">
<DependentUpon>umbracoSettings.config</DependentUpon>
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Content Remove="App_Data\**" />
<Content Remove="wwwroot\Umbraco\views\install\machinekey.html" />
<Content Remove="wwwroot\Umbraco\views\install\permissionsreport.html" />
<Content Remove="wwwroot\Umbraco\views\install\starterkit.html" />
<Content Remove="wwwroot\Umbraco\views\install\upgrade.html" />
<Content Remove="wwwroot\Umbraco\views\install\user.html" />
<Content Remove="wwwroot\Umbraco\views\install\version7upgradereport.html" />
<Content Remove="wwwroot\Umbraco\views\install\continueinstall.html" />
<Content Remove="wwwroot\Umbraco\views\install\database.html" />
<Content Remove="wwwroot\Umbraco\views\install\error.html" />
<Content Update="Areas\UmbracoInstall\Views\Install\Index.cshtml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="config\tinyMceConfig.config">
<SubType>Designer</SubType>
</Content>
<Content Update="config\umbracoSettings.config">
<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>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
@@ -90,38 +32,4 @@
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
</ItemGroup>
<ItemGroup>
<Content Remove="config\serilog.Release.config" />
<Content Remove="config\serilog.user.Release.config" />
</ItemGroup>
<ItemGroup>
<None Remove="config\logviewer.searches.config.js" />
</ItemGroup>
<ItemGroup>
<Content Include="config\grid.editors.config.js" />
<Content Include="config\logviewer.searches.config.js" />
</ItemGroup>
<ItemGroup>
<None Include="config\serilog.Release.config">
<SubType>Designer</SubType>
<DependentUpon>serilog.config</DependentUpon>
</None>
<None Include="config\serilog.user.Release.config">
<SubType>Designer</SubType>
<DependentUpon>serilog.user.config</DependentUpon>
</None>
</ItemGroup>
<ItemGroup>
<Content Update="config\serilog.config">
<SubType>Designer</SubType>
</Content>
<Content Update="config\serilog.user.config">
<SubType>Designer</SubType>
</Content>
</ItemGroup>
</Project>