From 3c40c20d27789c6c61e0541ee6d7145233a99155 Mon Sep 17 00:00:00 2001
From: vsilvar <vsilvar@users.noreply.github.com>
Date: Tue, 15 Feb 2022 15:09:31 +0100
Subject: [PATCH] Made sure Umbraco files aren't included twice

This fixes CS8785 RazorSourceGenerator failures due to repeated files in .Net 6
---
 .../NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets b/build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets
index 7f73c14650..2a95da1cd9 100644
--- a/build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets
+++ b/build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets
@@ -39,6 +39,7 @@
 
             <ContentWithTargetPath
                 Include="@(_AppPluginsFiles)"
+                Exclude="@(ContentWithTargetPath)"
                 TargetPath="%(Identity)"
                 CopyToOutputDirectory="PreserveNewest"
                 CopyToPublishDirectory="PreserveNewest"/>
@@ -65,6 +66,7 @@
 
             <ContentWithTargetPath
                 Include="@(_UmbracoFolderFiles)"
+                Exclude="@(ContentWithTargetPath)"
                 TargetPath="%(Identity)"
                 CopyToOutputDirectory="PreserveNewest"
                 CopyToPublishDirectory="PreserveNewest"/>
@@ -92,7 +94,7 @@
 
     <Target Name="IncludeUmbracoRazorFiles" BeforeTargets="ResolveRazorGenerateInputs">
         <ItemGroup>
-            <Content Include="$(MSBuildProjectDirectory)\umbraco\**\*.cshtml" />
+            <Content Include="$(MSBuildProjectDirectory)\umbraco\**\*.cshtml" Exclude="@(Content)" />
         </ItemGroup>
     </Target>