build: Refactor how pages are included

unoplatform · Jan 17, 2023 · 2bdb0b5 · 2bdb0b5
1 parent 6cf8e3b
commit 2bdb0b5
Show file tree

Hide file tree

Showing 23 changed files with 33 additions and 207 deletions.
diff --git 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
@@ -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
@@ -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/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
@@ -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
@@ -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 -->
@@ -52,9 +52,6 @@
 	<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>

diff --git 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
@@ -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.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
@@ -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
@@ -86,12 +86,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" />
-	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.18362'">
 		<Page Remove="$(MSBuildThisFileDirectory)MUX\Microsoft_UI_XAML_Controls\**\*.xaml" />
 	</ItemGroup>

diff --git 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
@@ -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
@@ -93,18 +93,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
@@ -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
@@ -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
@@ -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
@@ -93,11 +93,6 @@
 		</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" />
 

diff --git 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.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
@@ -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
@@ -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" />