Merge remote-tracking branch 'netcore/dev' into netcore/netcore

2020-08-26 08:05:15 +02:00
parent c561b256bf
commit 3d55dcd3c4
966 changed files with 9352 additions and 4199 deletions
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -21,6 +21,12 @@
    </ItemGroup>

    <ItemGroup>
+      <Folder Include="Views" />
+      <Folder Include="wwwroot\Media" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Compile Remove="wwwroot\Umbraco\**" />
        <Compile Remove="App_Data\**" />
    </ItemGroup>