From 6114d9380a2a6ac03cb931048dabad9a40ec0c9c Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Thu, 12 Jan 2023 13:13:35 +0200
Subject: [PATCH] build: Refactor how pages are included

---
 src/Common_ViewLibraryProps/Globbing.props    |  6 +---
 src/Directory.Build.props                     |  4 +++
 src/Directory.Build.targets                   |  4 +++
 src/PlatformItemGroups.props                  |  5 ---
 .../UITests.Shared/ItemExclusions.props       |  6 ++--
 ...o.UI.SourceGenerators.netcore.Tests.csproj |  2 +-
 .../XamlGenerationTests.csproj                |  4 ---
 src/Uno.CrossTargetting.props                 |  6 ----
 src/Uno.UI.FluentTheme.v1/FluentMerge.targets | 32 +++----------------
 src/Uno.UI.FluentTheme.v2/FluentMerge.targets | 32 +++----------------
 src/Uno.UI.FluentTheme/FluentMerge.targets    | 32 +++----------------
 src/Uno.UI.Maps/Uno.UI.Maps.csproj            |  5 ++-
 .../Uno.UI.RuntimeTests.Skia.csproj           |  8 -----
 .../Uno.UI.RuntimeTests.Wasm.csproj           |  8 -----
 .../Uno.UI.RuntimeTests.csproj                | 12 ++-----
 .../Uno.UI.RuntimeTests.netcoremobile.csproj  |  5 ---
 .../Uno.UI.Tests.ViewLibrary.csproj           |  5 ---
 src/Uno.UI.Tests/Uno.UI.Tests.csproj          | 17 ++--------
 .../Uno.UI.Toolkit.Reference.csproj           |  5 ---
 src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj |  5 ---
 src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj |  5 ---
 src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj      | 15 ++-------
 .../Uno.UI.Toolkit.netcoremobile.csproj       |  5 ---
 src/Uno.UI/Uno.UI.Reference.csproj            |  2 +-
 src/Uno.UI/Uno.UI.Skia.csproj                 |  9 +-----
 src/Uno.UI/Uno.UI.Wasm.csproj                 |  9 +-----
 src/Uno.UI/Uno.UI.csproj                      | 29 +++--------------
 src/Uno.UI/Uno.UI.netcoremobile.csproj        | 29 +++--------------
 28 files changed, 54 insertions(+), 252 deletions(-)

diff --git a/src/Common_ViewLibraryProps/Globbing.props b/src/Common_ViewLibraryProps/Globbing.props
index 89c168a8a68c..98824987543e 100644
--- a/src/Common_ViewLibraryProps/Globbing.props
+++ b/src/Common_ViewLibraryProps/Globbing.props
@@ -1,11 +1,7 @@
 <Project ToolsVersion="Current">
   <ItemGroup>
-    <Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
     <Compile Update="**\*.xaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 38aa4d9c8a4d..0c13768e49a5 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -9,6 +9,8 @@
     <NoWarn>$(NoWarn);MSB4011</NoWarn> <!-- Disable duplicate msbuild files imports message -->
     <NoWarn>$(NoWarn);NU1505</NoWarn> <!-- Disable: Duplicate 'PackageDownload' items found. Remove the duplicate items or use the Update functionality to ensure a consistent restore behavior. The duplicate 'PackageDownload' items are: Microsoft.NETCore.App.Host.win-x64 [3.1.25], Microsoft.NETCore.App.Host.win-x64 [3.1.25], Microsoft.NETCore.App.Host.win-x64 [3.1.25], Microsoft.NETCore.App.Host.win-x64 [3.1.25]. -->
 
+	<EnableAutomaticXamlPageInclusion>true</EnableAutomaticXamlPageInclusion>
+
     <DebugType>portable</DebugType>
     <DebugSymbols>True</DebugSymbols>
     <RepositoryUrl>$(BUILD_REPOSITORY_URI)</RepositoryUrl>
@@ -58,6 +60,8 @@
 
 	<!-- Enable ShouldWriteErrorOnInvalidXaml for all the sample and test projects of this solution -->
 	<ShouldWriteErrorOnInvalidXaml>True</ShouldWriteErrorOnInvalidXaml>
+
+	<ExtrasEnableDefaultPageItems>false</ExtrasEnableDefaultPageItems>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index eaa10063df1f..5b0a0cc90bac 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -6,6 +6,10 @@
 	<Product>$(AssemblyName) ($(TargetFramework) $(UnoRuntimeIdentifier))</Product>
   </PropertyGroup>
 
+  <ItemGroup Condition="$(EnableAutomaticXamlPageInclusion)">
+	<Page Include="**\*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(PageExclusions)" />
+  </ItemGroup>
+
 	<!--
 	Comment out this section if you need to update Resource.designer.cs files.
 	See DEVELOPMENT.md#Android for details.
diff --git a/src/PlatformItemGroups.props b/src/PlatformItemGroups.props
index a06e49d13f3c..e3f507533f34 100644
--- a/src/PlatformItemGroups.props
+++ b/src/PlatformItemGroups.props
@@ -94,11 +94,6 @@
 		<Compile Include="**\*.net.cs"
 						 Exclude="bin\**\*.net.cs;obj\**\*.net.cs"
 						 Condition="'$(TargetFramework)'=='net461'" />
-
-		<Page Include="**\*.xaml"
-					Exclude="bin/**/*.xaml;obj/**/*.xaml"
-					Condition="$(IsAndroid) or $(IsIOSOrCatalyst) or $(_IsUWP) or $(_IsNetStd) or $(IsMacOS)" />
-
 	</ItemGroup>
 
 </Project>
diff --git a/src/SamplesApp/UITests.Shared/ItemExclusions.props b/src/SamplesApp/UITests.Shared/ItemExclusions.props
index 3cc23295ebf6..4d570e51891a 100644
--- a/src/SamplesApp/UITests.Shared/ItemExclusions.props
+++ b/src/SamplesApp/UITests.Shared/ItemExclusions.props
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project>
   <ItemGroup Condition="'$(UNO_UWP_BUILD)'!='true'">
-	<Page Remove="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\MapPresenter\**" />
 	<Compile Remove="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\MapPresenter\**" />
-	<None Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\MapPresenter\**" />
   </ItemGroup>
+
+  <PropertyGroup Condition="'$(UNO_UWP_BUILD)'!='true'">
+  	<PageExclusions>$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\MapPresenter\**</PageExclusions>
+  </PropertyGroup>
 </Project>
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.netcore.Tests/Uno.UI.SourceGenerators.netcore.Tests.csproj b/src/SourceGenerators/Uno.UI.SourceGenerators.netcore.Tests/Uno.UI.SourceGenerators.netcore.Tests.csproj
index 7c7c51aaded5..321fcf819b53 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators.netcore.Tests/Uno.UI.SourceGenerators.netcore.Tests.csproj
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.netcore.Tests/Uno.UI.SourceGenerators.netcore.Tests.csproj
@@ -5,6 +5,7 @@
 		<IsPackable>false</IsPackable>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
+		<EnableAutomaticXamlPageInclusion>false</EnableAutomaticXamlPageInclusion>
 	</PropertyGroup>
 
 	<ItemGroup Label="GlobalUsings">
@@ -53,7 +54,6 @@
 
 	<ItemGroup>
 		<Compile Remove="MetadataUpdateTests\Scenarios\**" />
-		<Page Remove="MetadataUpdateTests\Scenarios\**" />
 		<Content Include="MetadataUpdateTests\Scenarios\**" CopyToOutputDirectory="PreserveNewest" />
 	</ItemGroup>
 
diff --git a/src/SourceGenerators/XamlGenerationTests/XamlGenerationTests.csproj b/src/SourceGenerators/XamlGenerationTests/XamlGenerationTests.csproj
index 5418deee65ee..22857d32c85b 100644
--- a/src/SourceGenerators/XamlGenerationTests/XamlGenerationTests.csproj
+++ b/src/SourceGenerators/XamlGenerationTests/XamlGenerationTests.csproj
@@ -37,10 +37,6 @@
 		<PackageReference Include="Xamarin.AndroidX.RecyclerView" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
-	</ItemGroup>
-
 	<ItemGroup>
 	  <PRIResource Include="Resources.resw" />
 	</ItemGroup>
diff --git a/src/Uno.CrossTargetting.props b/src/Uno.CrossTargetting.props
index 6c648449921f..ad50ca7a917e 100644
--- a/src/Uno.CrossTargetting.props
+++ b/src/Uno.CrossTargetting.props
@@ -89,12 +89,6 @@
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 	</PropertyGroup>
 
-	<ItemGroup Condition=" ($(IsAndroid) or $(IsIOS)) and '$(ExtrasIsReferenceAssembly)'!='' ">
-		<!-- remove files included by msbuild extras -->
-		<Page Remove="@(Page)" />
-		<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
-	</ItemGroup>
-
 	<Target Name="GetBuiltProjectOutputRecursive" Condition=" '$(TargetFramework)' == 'xamarinios10' " />
 
 	<Target Name="_DisplayTargets" BeforeTargets="BeforeBuild">
diff --git a/src/Uno.UI.FluentTheme.v1/FluentMerge.targets b/src/Uno.UI.FluentTheme.v1/FluentMerge.targets
index a27211087bc7..89e474110098 100644
--- a/src/Uno.UI.FluentTheme.v1/FluentMerge.targets
+++ b/src/Uno.UI.FluentTheme.v1/FluentMerge.targets
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project>
   <PropertyGroup>
-	<ThemesExclusion>$(MSBuildThisFileDirectory)Resources\**\*.xaml</ThemesExclusion>
+	<PageExclusions>$(MSBuildThisFileDirectory)Resources\**\*.xaml</PageExclusions>
   </PropertyGroup>
-  
+
   <UsingTask TaskName="BatchMergeXaml" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" />
 
   <!-- This task is temporarily placed in debug configuration to avoid parallel build concurrency issues -->
@@ -35,31 +35,9 @@
 	<Message Text="Theme resources XAML file was generated" />
   </Target>
 
-  <Choose>
-	<When Condition="'$(TargetFramework)'=='net461'">
-	  <ItemGroup>
-		<Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(ThemesExclusion)" />
-	  </ItemGroup>
-	</When>
-	<When Condition="'$(TargetFramework)'=='netstandard2.0' and '$(UnoRuntimeIdentifier)'=='Reference'">
-	  <ItemGroup>
-		<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(ThemesExclusion)" />
-
-		<!-- Remove all xaml files as netstandard2.0 is the reference target and won't be used at runtime -->
-		<Page Remove="@(Page)" />
-	  </ItemGroup>
-	</When>
-	<Otherwise>
-	  <ItemGroup>
-		<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(ThemesExclusion)" />
-
-		<!-- remove files included by msbuild extras -->
-		<Page Remove="@(Page)" />
-		<Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(ThemesExclusion)" />
-	  </ItemGroup>
-	</Otherwise>
-  </Choose>
-
+  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0' and '$(UnoRuntimeIdentifier)'=='Reference'">
+    <EnableAutomaticXamlPageInclusion>false</EnableAutomaticXamlPageInclusion>
+  </PropertyGroup>
 
   <PropertyGroup>
 	<UnoUIMSBuildTasksPath>$(MSBuildThisFileDirectory)..\SourceGenerators\Uno.UI.Tasks\bin\$(Configuration)_Shadow</UnoUIMSBuildTasksPath>
diff --git a/src/Uno.UI.FluentTheme.v2/FluentMerge.targets b/src/Uno.UI.FluentTheme.v2/FluentMerge.targets
index de06fd411cd6..82b2ea4a0aec 100644
--- a/src/Uno.UI.FluentTheme.v2/FluentMerge.targets
+++ b/src/Uno.UI.FluentTheme.v2/FluentMerge.targets
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project>
   <PropertyGroup>
-	<ThemesExclusion>$(MSBuildThisFileDirectory)Resources\**\*.xaml</ThemesExclusion>
+	<PageExclusions>$(MSBuildThisFileDirectory)Resources\**\*.xaml</PageExclusions>
   </PropertyGroup>
-  
+
   <UsingTask TaskName="BatchMergeXaml" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" />
 
   <!-- This task is temporarily placed in debug configuration to avoid parallel build concurrency issues -->
@@ -34,31 +34,9 @@
     <Message Text="Theme resources XAML file was generated" />
   </Target>
 
-  <Choose>
-	<When Condition="'$(TargetFramework)'=='net461'">
-	  <ItemGroup>
-		<Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(ThemesExclusion)" />
-	  </ItemGroup>
-	</When>
-	<When Condition="'$(TargetFramework)'=='netstandard2.0' and '$(UnoRuntimeIdentifier)'=='Reference'">
-	  <ItemGroup>
-		<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(ThemesExclusion)" />
-
-		<!-- Remove all xaml files as netstandard2.0 is the reference target and won't be used at runtime -->
-		<Page Remove="@(Page)" />
-	  </ItemGroup>
-	</When>
-	<Otherwise>
-	  <ItemGroup>
-		<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(ThemesExclusion)" />
-
-		<!-- remove files included by msbuild extras -->
-		<Page Remove="@(Page)" />
-		<Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(ThemesExclusion)" />
-	  </ItemGroup>
-	</Otherwise>
-  </Choose>
-
+  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0' and '$(UnoRuntimeIdentifier)'=='Reference'">
+    <EnableAutomaticXamlPageInclusion>false</EnableAutomaticXamlPageInclusion>
+  </PropertyGroup>
 
   <PropertyGroup>
 	<UnoUIMSBuildTasksPath>$(MSBuildThisFileDirectory)..\SourceGenerators\Uno.UI.Tasks\bin\$(Configuration)_Shadow</UnoUIMSBuildTasksPath>
diff --git a/src/Uno.UI.FluentTheme/FluentMerge.targets b/src/Uno.UI.FluentTheme/FluentMerge.targets
index 42dd85a9a7ed..f19df9dcf3f5 100644
--- a/src/Uno.UI.FluentTheme/FluentMerge.targets
+++ b/src/Uno.UI.FluentTheme/FluentMerge.targets
@@ -1,37 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project>
   <PropertyGroup>
-	<ThemesExclusion>$(MSBuildThisFileDirectory)Resources\**\*.xaml</ThemesExclusion>
+	<PageExclusions>$(MSBuildThisFileDirectory)Resources\**\*.xaml</PageExclusions>
   </PropertyGroup>
-  
-  <UsingTask TaskName="BatchMergeXaml" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" />
-
-
-  <Choose>
-	<When Condition="'$(TargetFramework)'=='net461'">
-	  <ItemGroup>
-		<Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(ThemesExclusion)" />
-	  </ItemGroup>
-	</When>
-	<When Condition="'$(TargetFramework)'=='netstandard2.0' and '$(UnoRuntimeIdentifier)'=='Reference'">
-	  <ItemGroup>
-		<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(ThemesExclusion)" />
 
-		<!-- Remove all xaml files as netstandard2.0 is the reference target and won't be used at runtime -->
-		<Page Remove="@(Page)" />
-	  </ItemGroup>
-	</When>
-	<Otherwise>
-	  <ItemGroup>
-		<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(ThemesExclusion)" />
+  <UsingTask TaskName="BatchMergeXaml" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" />
 
-		<!-- remove files included by msbuild extras -->
-		<Page Remove="@(Page)" />
-		<Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;$(ThemesExclusion)" />
-	  </ItemGroup>
-	</Otherwise>
-  </Choose>
 
+  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0' and '$(UnoRuntimeIdentifier)'=='Reference'">
+	<EnableAutomaticXamlPageInclusion>false</EnableAutomaticXamlPageInclusion>
+  </PropertyGroup>
 
   <PropertyGroup>
 	<UnoUIMSBuildTasksPath>$(MSBuildThisFileDirectory)..\SourceGenerators\Uno.UI.Tasks\bin\$(Configuration)_Shadow</UnoUIMSBuildTasksPath>
diff --git a/src/Uno.UI.Maps/Uno.UI.Maps.csproj b/src/Uno.UI.Maps/Uno.UI.Maps.csproj
index 8a975777b046..41e8ad820ead 100644
--- a/src/Uno.UI.Maps/Uno.UI.Maps.csproj
+++ b/src/Uno.UI.Maps/Uno.UI.Maps.csproj
@@ -90,8 +90,11 @@
 
 	<ItemGroup Condition="'$(UNO_UWP_BUILD)'!='true'">
 		<!-- Maps are not yet supported by WinUI 3.0 -->
-		<Page Remove="**\*.xaml" />
 		<Compile Remove="**\*.cs" />
 	</ItemGroup>
+	<PropertyGroup Condition="'$(UNO_UWP_BUILD)'!='true'">
+		<!-- Maps are not yet supported by WinUI 3.0 -->
+		<EnableAutomaticXamlPageInclusion>false</EnableAutomaticXamlPageInclusion>
+	</PropertyGroup>
 
 </Project>
diff --git a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj
index 29e13dbf51e8..bed92185478b 100644
--- a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj
+++ b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj
@@ -77,14 +77,6 @@
 	<Import Project="..\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" Condition="'$(SkipUnoResourceGeneration)' == '' " />
 	<Import Project="..\Uno.CrossTargetting.props" />
 
-	<ItemGroup>
-		<!-- remove files included by msbuild extras -->
-		<Page Remove="@(Page)" />
-		<Page Include="$(PlatformItemsBasePath)**/*.xaml" Exclude="$(PlatformItemsBasePath)bin/**/*.xaml;$(PlatformItemsBasePath)obj/**/*.xaml" />
-
-		<UpToDateCheckInput Include="$(PlatformItemsBasePath)**\*.xaml" Exclude="$(PlatformItemsBasePath)bin\**\*.xaml;$(PlatformItemsBasePath)obj\**\*.xaml" />
-  </ItemGroup>
-
 	<ItemGroup>
 	  <PRIResource Include="Resources\**\*.resw" />
 	</ItemGroup>
diff --git a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj
index a2534959fc76..4a8d952be2a7 100644
--- a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj
+++ b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj
@@ -93,12 +93,4 @@
 	<Import Project="..\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" Condition="'$(SkipUnoResourceGeneration)' == '' " />
 
 	<Import Project="..\Uno.CrossTargetting.props" />
-
-	<ItemGroup>
-		<!-- remove files included by msbuild extras -->
-		<Page Remove="@(Page)" />
-		<Page Include="$(PlatformItemsBasePath)**/*.xaml" Exclude="$(PlatformItemsBasePath)bin/**/*.xaml;$(PlatformItemsBasePath)obj/**/*.xaml" />
-
-		<UpToDateCheckInput Include="$(PlatformItemsBasePath)**\*.xaml" Exclude="$(PlatformItemsBasePath)bin\**\*.xaml;$(PlatformItemsBasePath)obj\**\*.xaml" />
-	</ItemGroup>
 </Project>
diff --git a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.csproj b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.csproj
index 110e2df6ca77..bfe233f5807a 100644
--- a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.csproj
+++ b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.csproj
@@ -86,15 +86,9 @@
 
 	<Import Project="..\Uno.CrossTargetting.props" />
 
-	<ItemGroup>
-		<!-- Remove already included XAML -->
-		<Page Remove="@(Page)" />
-		<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
-		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.18362'">
-		<Page Remove="$(MSBuildThisFileDirectory)MUX\Microsoft_UI_XAML_Controls\**\*.xaml" />
-	</ItemGroup>
+	<PropertyGroup Condition="'$(TargetFramework)'=='uap10.0.18362'">
+		<PageExclusions>$(MSBuildThisFileDirectory)MUX\Microsoft_UI_XAML_Controls\**\*.xaml</PageExclusions>
+	</PropertyGroup>
 
 	<ItemGroup>
 		<PRIResource Include="Resources\**\*.resw" />
diff --git a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.netcoremobile.csproj b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.netcoremobile.csproj
index 926c30678828..0877c318692e 100644
--- a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.netcoremobile.csproj
+++ b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.netcoremobile.csproj
@@ -52,11 +52,6 @@
 	<Import Project="..\Uno.CrossTargetting.props" />
 
 	<ItemGroup>
-		<!-- Remove already included XAML -->
-		<Page Remove="@(Page)" />
-		<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
-		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
-
 		<Content Include="Assets\**" />
 	</ItemGroup>
 
diff --git a/src/Uno.UI.Tests.ViewLibrary/Uno.UI.Tests.ViewLibrary.csproj b/src/Uno.UI.Tests.ViewLibrary/Uno.UI.Tests.ViewLibrary.csproj
index b5e6d3461f12..027a2ca8714d 100644
--- a/src/Uno.UI.Tests.ViewLibrary/Uno.UI.Tests.ViewLibrary.csproj
+++ b/src/Uno.UI.Tests.ViewLibrary/Uno.UI.Tests.ViewLibrary.csproj
@@ -51,11 +51,6 @@
 
 	<Target Name="BeforeBuildCleanup" BeforeTargets="XamlMarkupCompilePass1;_UnoSourceGenerator" />
 
-	<ItemGroup>
-		<Page Remove="@(Page)" />
-		<Page Include="Themes\**\*.xaml" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\SourceGenerators\System.Xaml\Uno.Xaml.csproj" />
 		<ProjectReference Include="..\Uno.UI\Uno.UI.csproj" />
diff --git a/src/Uno.UI.Tests/Uno.UI.Tests.csproj b/src/Uno.UI.Tests/Uno.UI.Tests.csproj
index 406ba5882c16..ea74087f7bb3 100644
--- a/src/Uno.UI.Tests/Uno.UI.Tests.csproj
+++ b/src/Uno.UI.Tests/Uno.UI.Tests.csproj
@@ -64,12 +64,10 @@
 		<EmbeddedResource Include="$(MSBuildThisFileDirectory)..\Uno.Net.Shared\Resources\**\*.resx">
 			<Link>Resources\%(RecursiveDir)%(FileName)%(Extension)</Link>
 		</EmbeddedResource>
-
-		<!-- This has to be after all the shared projects imports -->
-		<Page Remove="@(Page)" />
 	</ItemGroup>
 
 	<PropertyGroup>
+		<EnableAutomaticXamlPageInclusion>false</EnableAutomaticXamlPageInclusion>
 		<UnoUIMSBuildTasksPath>$(MSBuildThisFileDirectory)..\SourceGenerators\Uno.UI.Tasks\bin\$(Configuration)_Shadow</UnoUIMSBuildTasksPath>
 		<UnoForceProcessPRIResource>true</UnoForceProcessPRIResource>
 	</PropertyGroup>
@@ -93,18 +91,7 @@
 	<ItemGroup>
 		<PRIResource Include="**\*.resw" />
 	</ItemGroup>
-	<ItemGroup>
-		<Page Include="Windows_UI_Xaml\**\*.xaml" />
-		<Page Include="Windows_UI_Xaml_Data\**\*.xaml" />
-		<Page Include="Windows_UI_Xaml_Controls\**\*.xaml" />
-		<Page Include="ResourceLoader\Controls\**\*.xaml" />
-		<Page Include="Windows_UI_Xaml_Markup\**\*.xaml" />
-		<Page Include="HotReload\Windows_UI_Xaml\**\*.xaml" />
-		<Page Include="App\**\*.xaml" />
-		<None Remove="Lottie\animation.json" />
-		<None Remove="Windows_UI_Xaml_Markup\XamlReaderTests\When_CustomResource.xamltest" />
-		<Page Include="..\SamplesApp\UITests.Shared\Windows_UI_Xaml\Resources\Test_Dictionary_Linked.xaml" Link="App/Linked/Test_Dictionary_Linked.xaml" />
-	</ItemGroup>
+
 	<ItemGroup>
 		<Compile Include="..\Uno.UI.RuntimeTests\Helpers\SizeAssertion.cs" Link="Extensions\SizeAssertion.cs" />
 		<Compile Include="..\Uno.UI.RuntimeTests\Tests\Windows_UI_Xaml_Controls\Given_ListViewBase_Items.cs" Link="Windows_UI_XAML_Controls\ListViewBaseTests\Given_ListViewBase_Items.cs" />
diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Reference.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Reference.csproj
index e6cc1cb1bd3d..da636903b6d9 100644
--- a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Reference.csproj
+++ b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Reference.csproj
@@ -54,11 +54,6 @@
 		</ProjectReference>
 	</ItemGroup>
 
-	<ItemGroup>
-		<Page Remove="Themes\Generic.xaml" />
-		<Page Include="Themes\Generic.xaml" />
-	</ItemGroup>
-
 	<Import Project="..\SourceGenerators\Uno.UI.SourceGenerators\Content\Uno.UI.SourceGenerators.props" />
 
 	<Target Name="_UnoToolkitOverrideNuget" AfterTargets="AfterBuild" DependsOnTargets="BuiltProjectOutputGroup" Condition="'$(UnoNugetOverrideVersion)'!=''">
diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj
index 697138a7df14..40cb26d2ae2c 100644
--- a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj
+++ b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj
@@ -52,11 +52,6 @@
 		</ProjectReference>
 	</ItemGroup>
 
-	<ItemGroup>
-		<Page Remove="Themes\Generic.xaml" />
-		<Page Include="Themes\Generic.xaml" />
-	</ItemGroup>
-
 	<!-- Override existing target, this project cannot be published -->
 	<Target Name="Publish" />
 
diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj
index 81d207d7f876..cdb7001e83b5 100644
--- a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj
+++ b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj
@@ -46,11 +46,6 @@
 		</ProjectReference>
 	</ItemGroup>
 
-	<ItemGroup>
-		<Page Remove="Themes\Generic.xaml" />
-		<Page Include="Themes\Generic.xaml" />
-	</ItemGroup>
-
 	<!-- Override existing target, this project cannot be published -->
 	<Target Name="Publish" />
 
diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj
index 4831ac957350..52535b7e959a 100644
--- a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj
+++ b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj
@@ -93,18 +93,9 @@
 		</Compile>
 	</ItemGroup>
 
-	<ItemGroup>
-		<Page Remove="Themes\Generic.xaml" />
-		<Page Include="Themes\Generic.xaml" />
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-		<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml" />
-
-		<!-- Remove all xaml files as netstandard2.0 is the reference target and won't be used at runtime -->
-		<PageToRemove Remove="@(Page)" />
-		<Page Remove="@(PageToRemove)" />
-	</ItemGroup>
+	<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+		<EnableAutomaticXamlPageInclusion>false</EnableAutomaticXamlPageInclusion>
+	</PropertyGroup>
 
 	<!-- Override existing target, this project cannot be published -->
 	<Target Name="Publish" />
diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.netcoremobile.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.netcoremobile.csproj
index b4331a904510..d45d5a69efd1 100644
--- a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.netcoremobile.csproj
+++ b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.netcoremobile.csproj
@@ -62,11 +62,6 @@
 		</ProjectReference>
 	</ItemGroup>
 
-	<ItemGroup>
-		<Page Remove="Themes\Generic.xaml" />
-		<Page Include="Themes\Generic.xaml" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<EmbeddedResource Include="LinkerDefinition.net6.0.xml">
 			<LogicalName>$(AssemblyName).xml</LogicalName>
diff --git a/src/Uno.UI/Uno.UI.Reference.csproj b/src/Uno.UI/Uno.UI.Reference.csproj
index 48c59c7735dc..a4fce12e7473 100644
--- a/src/Uno.UI/Uno.UI.Reference.csproj
+++ b/src/Uno.UI/Uno.UI.Reference.csproj
@@ -52,7 +52,7 @@
 		<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
 
 		<!-- Remove all xaml files as netstandard2.0 is the reference target and won't be used at runtime -->
-		<Page Remove="@(Page)" />
+		<EnableAutomaticXamlPageInclusion>false</EnableAutomaticXamlPageInclusion>
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Uno.UI/Uno.UI.Skia.csproj b/src/Uno.UI/Uno.UI.Skia.csproj
index 727e98f71a14..2ac4145f3c11 100644
--- a/src/Uno.UI/Uno.UI.Skia.csproj
+++ b/src/Uno.UI/Uno.UI.Skia.csproj
@@ -66,15 +66,8 @@
 
 	<Import Project="..\Uno.CrossTargetting.props" />
 
-	<ItemGroup>
-		<None Include="$(PlatformItemsBasePath)**/*.xaml" Exclude="$(PlatformItemsBasePath)bin/**/*.xaml;$(PlatformItemsBasePath)obj/**/*.xaml;$(PlatformItemsBasePath)Themes\WinUI\Resources\**\*.xaml" />
-
-		<!-- remove files included by msbuild extras -->
-		<Page Remove="@(Page)" />
-		<Page Include="$(PlatformItemsBasePath)**/*.xaml" Exclude="$(PlatformItemsBasePath)bin/**/*.xaml;$(PlatformItemsBasePath)obj/**/*.xaml;$(PlatformItemsBasePath)Themes\WinUI\Resources\**\*.xaml" />
-	</ItemGroup>
-
 	<PropertyGroup>
+		<PageExclusions>$(PlatformItemsBasePath)Themes\WinUI\Resources\**\*.xaml</PageExclusions>
 		<UnoUIMSBuildTasksPath>$(MSBuildThisFileDirectory)..\SourceGenerators\Uno.UI.Tasks\bin\$(Configuration)_Shadow</UnoUIMSBuildTasksPath>
 
 		<CompileTypeScriptDependsOn>_UnoSourceGenerator; $(CompileTypeScriptDependsOn)</CompileTypeScriptDependsOn>
diff --git a/src/Uno.UI/Uno.UI.Wasm.csproj b/src/Uno.UI/Uno.UI.Wasm.csproj
index 1cb75d125217..a3085ae27a2e 100644
--- a/src/Uno.UI/Uno.UI.Wasm.csproj
+++ b/src/Uno.UI/Uno.UI.Wasm.csproj
@@ -107,15 +107,8 @@
 
 	<Import Project="..\Uno.CrossTargetting.props" />
 
-	<ItemGroup>
-		<None Include="$(PlatformItemsBasePath)**/*.xaml" Exclude="$(PlatformItemsBasePath)bin/**/*.xaml;$(PlatformItemsBasePath)obj/**/*.xaml;$(PlatformItemsBasePath)Themes\WinUI\Resources\**\*.xaml" />
-
-		<!-- remove files included by msbuild extras -->
-		<Page Remove="@(Page)" />
-		<Page Include="$(PlatformItemsBasePath)**/*.xaml" Exclude="$(PlatformItemsBasePath)bin/**/*.xaml;$(PlatformItemsBasePath)obj/**/*.xaml;$(PlatformItemsBasePath)Themes\WinUI\Resources\**\*.xaml" />
-	</ItemGroup>
-
 	<PropertyGroup>
+		<PageExclusions>$(PlatformItemsBasePath)Themes\WinUI\Resources\**\*.xaml</PageExclusions>
 		<UnoUIMSBuildTasksPath>$(MSBuildThisFileDirectory)..\SourceGenerators\Uno.UI.Tasks\bin\$(Configuration)_Shadow</UnoUIMSBuildTasksPath>
 
 		<CompileTypeScriptDependsOn>CoreCompile;_UnoSetupTSCompilation; $(CompileTypeScriptDependsOn)</CompileTypeScriptDependsOn>
diff --git a/src/Uno.UI/Uno.UI.csproj b/src/Uno.UI/Uno.UI.csproj
index 3b9cea033360..7934c90d3807 100644
--- a/src/Uno.UI/Uno.UI.csproj
+++ b/src/Uno.UI/Uno.UI.csproj
@@ -39,6 +39,8 @@
 
 		<!-- Set for dependencies that use msbuild nuget packaging (not nuspecs) -->
 		<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI</PackageId>
+
+		<PageExclusions>Themes\WinUI\Resources\**\*.xaml</PageExclusions>
 	</PropertyGroup>
 
 	<Import Project="..\Uno.CrossTargetting.props" />
@@ -49,30 +51,9 @@
 		<UpToDateCheckInput Include="**\*.tt" Exclude="bin\**\*.tt;obj\**\*.tt;" Visible="False" />
 	</ItemGroup>
 
-	<Choose>
-		<When Condition="'$(TargetFramework)'=='net461'">
-			<ItemGroup>
-				<Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
-			</ItemGroup>
-		</When>
-		<When Condition="'$(TargetFramework)'=='netstandard2.0'">
-			<ItemGroup>
-				<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
-
-				<!-- Remove all xaml files as netstandard2.0 is the reference target and won't be used at runtime -->
-				<Page Remove="@(Page)" />
-			</ItemGroup>
-		</When>
-		<Otherwise>
-			<ItemGroup>
-				<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
-
-				<!-- remove files included by msbuild extras -->
-				<Page Remove="@(Page)" />
-				<Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
-			</ItemGroup>
-		</Otherwise>
-	</Choose>
+	<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+		<EnableAutomaticXamlPageInclusion>false</EnableAutomaticXamlPageInclusion>
+	</PropertyGroup>
 
 	<ItemGroup>
 		<None Include="Extensions\CGSizeExtensions.iOSmacOS.cs" />
diff --git a/src/Uno.UI/Uno.UI.netcoremobile.csproj b/src/Uno.UI/Uno.UI.netcoremobile.csproj
index 9067594121d2..81f9df1583d0 100644
--- a/src/Uno.UI/Uno.UI.netcoremobile.csproj
+++ b/src/Uno.UI/Uno.UI.netcoremobile.csproj
@@ -46,6 +46,8 @@
 
 		<!-- Disabled because of LinkerDefinitionMergerTask performance issues https://github.com/unoplatform/uno/issues/9632 -->
 		<!--<UnoXamlResourcesTrimming Condition="'$(Configuration)'!='Debug'">true</UnoXamlResourcesTrimming>-->
+
+		<PageExclusions>Themes\WinUI\Resources\**\*.xaml</PageExclusions>
 	</PropertyGroup>
 
 	<Import Project="..\Uno.CrossTargetting.props" />
@@ -56,30 +58,9 @@
 		<UpToDateCheckInput Include="**\*.tt" Exclude="bin\**\*.tt;obj\**\*.tt;" Visible="False" />
 	</ItemGroup>
 
-	<Choose>
-		<When Condition="'$(TargetFramework)'=='net461'">
-			<ItemGroup>
-				<Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
-			</ItemGroup>
-		</When>
-		<When Condition="'$(TargetFramework)'=='netstandard2.0'">
-			<ItemGroup>
-				<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
-
-				<!-- Remove all xaml files as netstandard2.0 is the reference target and won't be used at runtime -->
-				<Page Remove="@(Page)" />
-			</ItemGroup>
-		</When>
-		<Otherwise>
-			<ItemGroup>
-				<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
-
-				<!-- remove files included by msbuild extras -->
-				<Page Remove="@(Page)" />
-				<Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
-			</ItemGroup>
-		</Otherwise>
-	</Choose>
+	<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+		<EnableAutomaticXamlPageInclusion>false</EnableAutomaticXamlPageInclusion>
+	</PropertyGroup>
 
 	<ItemGroup>
 		<None Include="Extensions\CGSizeExtensions.iOSmacOS.cs" />