V9 - Include models folder in the project (#10250)

* fixes #10213. When models folder is included in project the models have a Build Action of C# Compiler

* models directory comment indicates correct models location

* added PureLive files to App_Data/Temp

* changed PureLive directory

* include generated models in project

* https://github.com/umbraco/Umbraco-CMS/pull/10250/ - Cleanup in csproj file and fix the generated template too

Co-authored-by: Mario Lopez <mario@monkii.com>
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
This commit is contained in:
Mario Lopez
2021-05-17 17:50:58 +10:00
committed by GitHub
parent 0ae3a2d7ef
commit 69a507e5db
4 changed files with 36 additions and 32 deletions

View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
@@ -28,7 +28,6 @@
<Compile Remove="umbraco\Data\**" />
<Compile Remove="umbraco\logs\**" />
<Compile Remove="umbraco\MediaCache\**" />
<Compile Remove="umbraco\models\**" />
<Compile Remove="wwwroot\Umbraco\**" />
<Compile Remove="App_Data\**" />
</ItemGroup>
@@ -38,7 +37,6 @@
<EmbeddedResource Remove="umbraco\Data\**" />
<EmbeddedResource Remove="umbraco\logs\**" />
<EmbeddedResource Remove="umbraco\MediaCache\**" />
<EmbeddedResource Remove="umbraco\models\**" />
</ItemGroup>
<ItemGroup>
@@ -46,7 +44,6 @@
<Content Remove="umbraco\Data\**" />
<Content Remove="umbraco\logs\**" />
<Content Remove="umbraco\MediaCache\**" />
<Content Remove="umbraco\models\**" />
<Content Remove="wwwroot\Web.config" />
</ItemGroup>
@@ -64,9 +61,9 @@
<None Remove="umbraco\Data\**" />
<None Remove="umbraco\logs\**" />
<None Remove="umbraco\MediaCache\**" />
<None Remove="umbraco\models\**" />
<None Include="umbraco\UmbracoWebsite\NoNodes.cshtml" />
<None Remove="scripts\aaa\fc75309db05f41609a9e1adb8cf0998c.tmp" />
<None Remove="umbraco\models\**" />
</ItemGroup>
<!-- We don't want to include the generated files, they will throw a lot of errors -->