From bc49fa5b3fa870b66a36f34f98a4569cc5034d0e Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 3 May 2022 17:15:38 +0200
Subject: [PATCH] Move default item excludes to root package (#12339)

* Moved DefaultItemExcludes to Umbraco.CMS package

* Use exact path to build props

Co-authored-by: Ronald Barendse <ronald@barend.se>
---
 build/NuSpecs/UmbracoCms.nuspec                             | 5 +++--
 .../NuSpecs/buildTransitive/Umbraco.Cms.props               | 0
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj                    | 2 +-
 umbraco.sln                                                 | 6 ++++++
 4 files changed, 10 insertions(+), 3 deletions(-)
 rename src/Umbraco.Cms.StaticAssets/buildTransitive/Umbraco.Cms.StaticAssets.props => build/NuSpecs/buildTransitive/Umbraco.Cms.props (100%)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 127fd28220..614a902d30 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -30,6 +30,7 @@
         -->
         <contentFiles />
     </metadata>
-    <files>
-    </files>
+  <files>
+    <file src="buildTransitive\Umbraco.Cms.props" target="buildTransitive" />
+  </files>
 </package>
diff --git a/src/Umbraco.Cms.StaticAssets/buildTransitive/Umbraco.Cms.StaticAssets.props b/build/NuSpecs/buildTransitive/Umbraco.Cms.props
similarity index 100%
rename from src/Umbraco.Cms.StaticAssets/buildTransitive/Umbraco.Cms.StaticAssets.props
rename to build/NuSpecs/buildTransitive/Umbraco.Cms.props
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index e734289ed5..88b76d1af0 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>Umbraco.Cms.Web.UI</RootNamespace>
   </PropertyGroup>
 
-  <Import Project="..\Umbraco.Cms.StaticAssets\buildTransitive\Umbraco.Cms.StaticAssets.props" />
+  <Import Project="..\..\build\NuSpecs\buildTransitive\Umbraco.Cms.props" />
   
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <DocumentationFile>bin/Release/Umbraco.Web.UI.xml</DocumentationFile>
diff --git a/umbraco.sln b/umbraco.sln
index ab90d22d0d..79b2a3f85a 100644
--- a/umbraco.sln
+++ b/umbraco.sln
@@ -126,6 +126,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Persistence.Sql
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.StaticAssets", "src\Umbraco.Cms.StaticAssets\Umbraco.Cms.StaticAssets.csproj", "{D2FD54E8-3470-4A98-8B0C-A9ACB59BED48}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "buildTransitive", "buildTransitive", "{A05481CB-A335-4BB7-9A86-1BBB3874F742}"
+	ProjectSection(SolutionItems) = preProject
+		build\NuSpecs\buildTransitive\Umbraco.Cms.props = build\NuSpecs\buildTransitive\Umbraco.Cms.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -250,6 +255,7 @@ Global
 		{D6319409-777A-4BD0-93ED-B2DFD805B32C} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{A499779C-1B3B-48A8-B551-458E582E6E96} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{9102ABDF-E537-4E46-B525-C9ED4833EED0} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
+		{A05481CB-A335-4BB7-9A86-1BBB3874F742} = {227C3B55-80E5-4E7E-A802-BE16C5128B9D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7A0F2E34-D2AF-4DAB-86A0-7D7764B3D0EC}