From baf69305f302e72cafc88ab88a7f32b5b38a73b8 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Thu, 5 Aug 2021 12:51:53 +0300
Subject: [PATCH] Exclude the wanted folders in the order Content, Compile,
 EmbeddedResource and None. Have the None Remove after None Include

---
 .../UmbracoProject/UmbracoProject.csproj       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/templates/UmbracoProject/UmbracoProject.csproj b/build/templates/UmbracoProject/UmbracoProject.csproj
index 86562f7957..2310f789e2 100644
--- a/build/templates/UmbracoProject/UmbracoProject.csproj
+++ b/build/templates/UmbracoProject/UmbracoProject.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Umbraco.Cms.Web.UI.NetCore</RootNamespace>
@@ -15,6 +15,11 @@
         <ProjectReference Include="..\PackageTestSiteName\PackageTestSiteName.csproj"/>
     </ItemGroup>
 
+    <ItemGroup>
+        <Content Remove="umbraco\Data\**" />
+        <Content Remove="umbraco\logs\**" />
+        <Content Remove="umbraco\MediaCache\**" />
+    </ItemGroup>
     <ItemGroup>
         <Compile Remove="umbraco\Data\**" />
         <Compile Remove="umbraco\logs\**" />
@@ -26,9 +31,6 @@
         <EmbeddedResource Remove="umbraco\MediaCache\**" />
     </ItemGroup>
     <ItemGroup>
-        <None Remove="umbraco\Data\**" />
-        <None Remove="umbraco\logs\**" />
-        <None Remove="umbraco\MediaCache\**" />
         <None Include="config\**\*.*">
             <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
             <CopyToPublishDirectory>Always</CopyToPublishDirectory>
@@ -37,11 +39,9 @@
             <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
             <CopyToPublishDirectory>Always</CopyToPublishDirectory>
         </None>
-    </ItemGroup>
-    <ItemGroup>
-        <Content Remove="umbraco\Data\**" />
-        <Content Remove="umbraco\logs\**" />
-        <Content Remove="umbraco\MediaCache\**" />
+        <None Remove="umbraco\Data\**" />
+        <None Remove="umbraco\logs\**" />
+        <None Remove="umbraco\MediaCache\**" />
     </ItemGroup>
 
     <!-- Set this to true if ModelsBuilder mode is not InMemoryAuto-->